1 |
Author: zmedico |
2 |
Date: 2008-11-01 07:09:19 +0000 (Sat, 01 Nov 2008) |
3 |
New Revision: 11780 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/portage/__init__.py |
7 |
main/trunk/pym/portage/dbapi/vartree.py |
8 |
Log: |
9 |
Also call PreservedLibsRegistry.pruneNonExisting() after obtaining a lock |
10 |
and loading it for merge or unmerge. |
11 |
|
12 |
|
13 |
Modified: main/trunk/pym/portage/__init__.py |
14 |
=================================================================== |
15 |
--- main/trunk/pym/portage/__init__.py 2008-11-01 06:48:51 UTC (rev 11779) |
16 |
+++ main/trunk/pym/portage/__init__.py 2008-11-01 07:09:19 UTC (rev 11780) |
17 |
@@ -6067,6 +6067,7 @@ |
18 |
mylink.lockdb() |
19 |
if mylink.exists(): |
20 |
vartree.dbapi.plib_registry.load() |
21 |
+ vartree.dbapi.plib_registry.pruneNonExisting() |
22 |
retval = mylink.unmerge(trimworld=mytrimworld, cleanup=1, |
23 |
ldpath_mtimes=ldpath_mtimes) |
24 |
if retval == os.EX_OK: |
25 |
|
26 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
27 |
=================================================================== |
28 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-11-01 06:48:51 UTC (rev 11779) |
29 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-11-01 07:09:19 UTC (rev 11780) |
30 |
@@ -3744,6 +3744,7 @@ |
31 |
self.lockdb() |
32 |
try: |
33 |
self.vartree.dbapi.plib_registry.load() |
34 |
+ self.vartree.dbapi.plib_registry.pruneNonExisting() |
35 |
retval = self.treewalk(mergeroot, myroot, inforoot, myebuild, |
36 |
cleanup=cleanup, mydbapi=mydbapi, prev_mtimes=prev_mtimes) |
37 |
# undo registrations of preserved libraries, bug #210501 |