| 1 |
Author: zmedico |
| 2 |
Date: 2008-08-04 01:11:07 +0000 (Mon, 04 Aug 2008) |
| 3 |
New Revision: 11323 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Make dblink.unmerge() succeed even when ebuild phases are unsuccessful because |
| 9 |
the current behavior is even worse (results in orphan files). Thanks to |
| 10 |
Arfrever for this patch (UnsupportedAPIException hunk by me). |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-08-03 19:17:54 UTC (rev 11322) |
| 16 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-08-04 01:11:07 UTC (rev 11323) |
| 17 |
@@ -1607,10 +1607,12 @@ |
| 18 |
writemsg("!!! FAILED prerm: %s\n" % \ |
| 19 |
os.path.join(self.dbdir, "EAPI"), noiselevel=-1) |
| 20 |
writemsg("%s\n" % str(e), noiselevel=-1) |
| 21 |
- return 1 |
| 22 |
- catdir = os.path.dirname(self.settings["PORTAGE_BUILDDIR"]) |
| 23 |
- ensure_dirs(os.path.dirname(catdir), |
| 24 |
- uid=portage_uid, gid=portage_gid, mode=070, mask=0) |
| 25 |
+ myebuildpath = None |
| 26 |
+ else: |
| 27 |
+ catdir = os.path.dirname(self.settings["PORTAGE_BUILDDIR"]) |
| 28 |
+ ensure_dirs(os.path.dirname(catdir), uid=portage_uid, |
| 29 |
+ gid=portage_gid, mode=070, mask=0) |
| 30 |
+ |
| 31 |
builddir_lock = None |
| 32 |
catdir_lock = None |
| 33 |
scheduler = self._scheduler |
| 34 |
@@ -1643,7 +1645,6 @@ |
| 35 |
# XXX: Decide how to handle failures here. |
| 36 |
if retval != os.EX_OK: |
| 37 |
writemsg("!!! FAILED prerm: %s\n" % retval, noiselevel=-1) |
| 38 |
- return retval |
| 39 |
|
| 40 |
self._unmerge_pkgfiles(pkgfiles, others_in_slot) |
| 41 |
|
| 42 |
@@ -1665,7 +1666,6 @@ |
| 43 |
# XXX: Decide how to handle failures here. |
| 44 |
if retval != os.EX_OK: |
| 45 |
writemsg("!!! FAILED postrm: %s\n" % retval, noiselevel=-1) |
| 46 |
- return retval |
| 47 |
|
| 48 |
# regenerate reverse NEEDED map |
| 49 |
self.vartree.dbapi.linkmap.rebuild() |
Archives