diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-08-04 01:11:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-08-04 01:11:07 +0000 |
| commit | e0ad2f0d54628c91eb7aaf7824962a153a9afe15 (patch) | |
| tree | 36e8214056701bbc511671a59be282c8cc0343f6 | |
| parent | c84fc9ea8318b029eceac650d48a4f1fd90d82bd (diff) | |
| download | portage-e0ad2f0d54628c91eb7aaf7824962a153a9afe15.tar.gz portage-e0ad2f0d54628c91eb7aaf7824962a153a9afe15.tar.bz2 portage-e0ad2f0d54628c91eb7aaf7824962a153a9afe15.zip | |
Make dblink.unmerge() succeed even when ebuild phases are unsuccessful because
the current behavior is even worse (results in orphan files). Thanks to
Arfrever for this patch (UnsupportedAPIException hunk by me).
svn path=/main/trunk/; revision=11323
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index c8babe546..8d40c24be 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1607,10 +1607,12 @@ class dblink(object): writemsg("!!! FAILED prerm: %s\n" % \ os.path.join(self.dbdir, "EAPI"), noiselevel=-1) writemsg("%s\n" % str(e), noiselevel=-1) - return 1 - catdir = os.path.dirname(self.settings["PORTAGE_BUILDDIR"]) - ensure_dirs(os.path.dirname(catdir), - uid=portage_uid, gid=portage_gid, mode=070, mask=0) + myebuildpath = None + else: + catdir = os.path.dirname(self.settings["PORTAGE_BUILDDIR"]) + ensure_dirs(os.path.dirname(catdir), uid=portage_uid, + gid=portage_gid, mode=070, mask=0) + builddir_lock = None catdir_lock = None scheduler = self._scheduler @@ -1643,7 +1645,6 @@ class dblink(object): # XXX: Decide how to handle failures here. if retval != os.EX_OK: writemsg("!!! FAILED prerm: %s\n" % retval, noiselevel=-1) - return retval self._unmerge_pkgfiles(pkgfiles, others_in_slot) @@ -1665,7 +1666,6 @@ class dblink(object): # XXX: Decide how to handle failures here. if retval != os.EX_OK: writemsg("!!! FAILED postrm: %s\n" % retval, noiselevel=-1) - return retval # regenerate reverse NEEDED map self.vartree.dbapi.linkmap.rebuild() |