| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-01 06:48:51 +0000 (Sat, 01 Nov 2008) |
| 3 |
New Revision: 11779 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
main/trunk/pym/portage/dbapi/vartree.py |
| 8 |
Log: |
| 9 |
Explicitly load the preserved libs registry after obtaining a lock for merge |
| 10 |
or unmerge, in case the registry has been changed by a parallel emerge |
| 11 |
instance. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/portage/__init__.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/portage/__init__.py 2008-11-01 06:40:36 UTC (rev 11778) |
| 17 |
+++ main/trunk/pym/portage/__init__.py 2008-11-01 06:48:51 UTC (rev 11779) |
| 18 |
@@ -6066,6 +6066,7 @@ |
| 19 |
try: |
| 20 |
mylink.lockdb() |
| 21 |
if mylink.exists(): |
| 22 |
+ vartree.dbapi.plib_registry.load() |
| 23 |
retval = mylink.unmerge(trimworld=mytrimworld, cleanup=1, |
| 24 |
ldpath_mtimes=ldpath_mtimes) |
| 25 |
if retval == os.EX_OK: |
| 26 |
|
| 27 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 28 |
=================================================================== |
| 29 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-11-01 06:40:36 UTC (rev 11778) |
| 30 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-11-01 06:48:51 UTC (rev 11779) |
| 31 |
@@ -3743,6 +3743,7 @@ |
| 32 |
retval = -1 |
| 33 |
self.lockdb() |
| 34 |
try: |
| 35 |
+ self.vartree.dbapi.plib_registry.load() |
| 36 |
retval = self.treewalk(mergeroot, myroot, inforoot, myebuild, |
| 37 |
cleanup=cleanup, mydbapi=mydbapi, prev_mtimes=prev_mtimes) |
| 38 |
# undo registrations of preserved libraries, bug #210501 |
Archives