| 1 |
Author: genone |
| 2 |
Date: 2008-03-02 11:40:50 +0000 (Sun, 02 Mar 2008) |
| 3 |
New Revision: 9406 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
undo registrations of preserved libraries if the merge fails, bug #210501 |
| 9 |
|
| 10 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 11 |
=================================================================== |
| 12 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-03-01 17:55:34 UTC (rev 9405) |
| 13 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-03-02 11:40:50 UTC (rev 9406) |
| 14 |
@@ -2511,6 +2511,9 @@ |
| 15 |
try: |
| 16 |
retval = self.treewalk(mergeroot, myroot, inforoot, myebuild, |
| 17 |
cleanup=cleanup, mydbapi=mydbapi, prev_mtimes=prev_mtimes) |
| 18 |
+ # undo registrations of preserved libraries, bug #210501 |
| 19 |
+ if retval != os.EX_OK: |
| 20 |
+ self.vartree.dbapi.plib_registry.unregister(self.mycpv, self.settings["SLOT"], self.settings["COUNTER"]) |
| 21 |
# Process ebuild logfiles |
| 22 |
elog_process(self.mycpv, self.settings, phasefilter=filter_mergephases) |
| 23 |
if retval == os.EX_OK and "noclean" not in self.settings.features: |
| 24 |
|
| 25 |
-- |
| 26 |
gentoo-commits@l.g.o mailing list |
Archives