From: Marius Mauch <genone@gentoo.org>
Date: Sun, 2 Mar 2008 11:40:50 +0000 (-0000)
Subject: undo registrations of preserved libraries if the merge fails, bug #210501
X-Git-Tag: v2.2_pre4~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c956a435365bc19f746eb75650b21a5613683783;p=portage.git

undo registrations of preserved libraries if the merge fails, bug #210501

svn path=/main/trunk/; revision=9406
---

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: