From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 14 Apr 2008 19:18:35 +0000 (-0000)
Subject: Fix issues with an empty string being passed into
X-Git-Tag: v2.2_pre6~158
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1a08212fbc0ce06f96cbc3bca839bcda9dba546a;p=portage.git

Fix issues with an empty string being passed into
PreservedLibsRegistry.register() now that COUNTER is not loaded
via config.load_infodir(). Thanks to grobian for reporting.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index cba96cacd..77c589195 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1168,7 +1168,8 @@ class dblink(object):
 			
 			# Remove the registration of preserved libs for this pkg instance
 			plib_registry = self.vartree.dbapi.plib_registry
-			plib_registry.unregister(self.mycpv, self.settings["SLOT"], self.settings["COUNTER"])
+			plib_registry.unregister(self.mycpv, self.settings["SLOT"],
+				self.vartree.dbapi.cpv_counter(self.mycpv))
 
 			if myebuildpath:
 				ebuild_phase = "postrm"
@@ -1879,6 +1880,10 @@ class dblink(object):
 		#       has to be before the counter is written) - genone
 		counter = self.vartree.dbapi.counter_tick(self.myroot, mycpv=self.mycpv)
 
+		# Save this for unregistering preserved-libs if the merge fails.
+		self.settings["COUNTER"] = str(counter)
+		self.settings.backup_changes("COUNTER")
+
 		myfilelist = []
 		mylinklist = []
 		def onerror(e):