From c956a435365bc19f746eb75650b21a5613683783 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Sun, 2 Mar 2008 11:40:50 +0000 Subject: undo registrations of preserved libraries if the merge fails, bug #210501 svn path=/main/trunk/; revision=9406 --- pym/portage/dbapi/vartree.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 3c47d24fd..f49eb9dbc 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2511,6 +2511,9 @@ class dblink(object): try: retval = self.treewalk(mergeroot, myroot, inforoot, myebuild, cleanup=cleanup, mydbapi=mydbapi, prev_mtimes=prev_mtimes) + # undo registrations of preserved libraries, bug #210501 + if retval != os.EX_OK: + self.vartree.dbapi.plib_registry.unregister(self.mycpv, self.settings["SLOT"], self.settings["COUNTER"]) # Process ebuild logfiles elog_process(self.mycpv, self.settings, phasefilter=filter_mergephases) if retval == os.EX_OK and "noclean" not in self.settings.features: -- cgit v1.2.3-1-g7c22