1 |
Author: grobian |
2 |
Date: 2008-04-14 18:04:12 +0000 (Mon, 14 Apr 2008) |
3 |
New Revision: 9894 |
4 |
|
5 |
Modified: |
6 |
main/branches/prefix/pym/portage/dbapi/vartree.py |
7 |
Log: |
8 |
In the absence of expertise: layman's fix for the following error: |
9 |
|
10 |
File "pym/portage/dbapi/vartree.py", line 1189, in unmerge |
11 |
plib_registry.unregister(self.mycpv, self.settings["SLOT"], self.settings["COUNTER"]) |
12 |
File "pym/portage/dbapi/vartree.py", line 100, in unregister |
13 |
self.register(cpv, slot, counter, []) |
14 |
File "pym/portage/dbapi/vartree.py", line 86, in register |
15 |
and self._data[cps][0] == cpv and int(self._data[cps][1]) == int(counter): |
16 |
ValueError: invalid literal for int() with base 10: '' |
17 |
|
18 |
COUNTER appears to be empty quite often, in this case it is often and |
19 |
called by some preserved-libs stuff. I just replace counter with an |
20 |
explicit 0 in case counter == "". |
21 |
|
22 |
|
23 |
|
24 |
Modified: main/branches/prefix/pym/portage/dbapi/vartree.py |
25 |
=================================================================== |
26 |
--- main/branches/prefix/pym/portage/dbapi/vartree.py 2008-04-14 17:49:59 UTC (rev 9893) |
27 |
+++ main/branches/prefix/pym/portage/dbapi/vartree.py 2008-04-14 18:04:12 UTC (rev 9894) |
28 |
@@ -82,6 +82,8 @@ |
29 |
""" |
30 |
cp = "/".join(catpkgsplit(cpv)[:2]) |
31 |
cps = cp+":"+slot |
32 |
+ if counter == "": |
33 |
+ counter = "0" |
34 |
if len(paths) == 0 and self._data.has_key(cps) \ |
35 |
and self._data[cps][0] == cpv and int(self._data[cps][1]) == int(counter): |
36 |
del self._data[cps] |
37 |
|
38 |
-- |
39 |
gentoo-commits@l.g.o mailing list |