| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-14 19:18:35 +0000 (Mon, 14 Apr 2008) |
| 3 |
New Revision: 9895 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Fix issues with an empty string being passed into |
| 9 |
PreservedLibsRegistry.register() now that COUNTER is not loaded |
| 10 |
via config.load_infodir(). Thanks to grobian for reporting. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-04-14 18:04:12 UTC (rev 9894) |
| 16 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-04-14 19:18:35 UTC (rev 9895) |
| 17 |
@@ -1168,7 +1168,8 @@ |
| 18 |
|
| 19 |
# Remove the registration of preserved libs for this pkg instance |
| 20 |
plib_registry = self.vartree.dbapi.plib_registry |
| 21 |
- plib_registry.unregister(self.mycpv, self.settings["SLOT"], self.settings["COUNTER"]) |
| 22 |
+ plib_registry.unregister(self.mycpv, self.settings["SLOT"], |
| 23 |
+ self.vartree.dbapi.cpv_counter(self.mycpv)) |
| 24 |
|
| 25 |
if myebuildpath: |
| 26 |
ebuild_phase = "postrm" |
| 27 |
@@ -1879,6 +1880,10 @@ |
| 28 |
# has to be before the counter is written) - genone |
| 29 |
counter = self.vartree.dbapi.counter_tick(self.myroot, mycpv=self.mycpv) |
| 30 |
|
| 31 |
+ # Save this for unregistering preserved-libs if the merge fails. |
| 32 |
+ self.settings["COUNTER"] = str(counter) |
| 33 |
+ self.settings.backup_changes("COUNTER") |
| 34 |
+ |
| 35 |
myfilelist = [] |
| 36 |
mylinklist = [] |
| 37 |
def onerror(e): |
| 38 |
|
| 39 |
-- |
| 40 |
gentoo-commits@l.g.o mailing list |
Archives