diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-14 19:18:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-14 19:18:35 +0000 |
| commit | 1a08212fbc0ce06f96cbc3bca839bcda9dba546a (patch) | |
| tree | c6b6945e59e99866d5cfeabb74b58ef0c8dacd43 | |
| parent | b51eaf64fba63204414f91a000973147dfe1ede8 (diff) | |
| download | portage-1a08212fbc0ce06f96cbc3bca839bcda9dba546a.tar.gz portage-1a08212fbc0ce06f96cbc3bca839bcda9dba546a.tar.bz2 portage-1a08212fbc0ce06f96cbc3bca839bcda9dba546a.zip | |
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
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 7 |
1 files changed, 6 insertions, 1 deletions
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): |