diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-14 19:55:24 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-14 19:55:24 -0700 |
| commit | 03d2647d5c8d74088b29283598f8c4a0fef5db96 (patch) | |
| tree | 65ad08e3411ffb1dab3017b22d76ad314846cba1 /pym/portage/dbapi/vartree.py | |
| parent | 39b034d11b8a3118e8c1cfc6f6d06df43e5efa35 (diff) | |
| download | portage-03d2647d5c8d74088b29283598f8c4a0fef5db96.tar.gz portage-03d2647d5c8d74088b29283598f8c4a0fef5db96.tar.bz2 portage-03d2647d5c8d74088b29283598f8c4a0fef5db96.zip | |
preserve-libs: use vardbapi _fs_lock/unlock
The preserve-libs code is too dependent on the filesystem state to
allow merging/unmerge/env_update to execute concurrently.
Diffstat (limited to 'pym/portage/dbapi/vartree.py')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index a2e38f6ec..5db267d53 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1509,6 +1509,7 @@ class dblink(object): # remove preserved libraries that don't have any consumers left plib_registry = self.vartree.dbapi._plib_registry if plib_registry: + self.vartree.dbapi._fs_lock() plib_registry.lock() try: plib_registry.load() @@ -1564,6 +1565,7 @@ class dblink(object): plib_registry.store() finally: plib_registry.unlock() + self.vartree.dbapi._fs_unlock() def unmerge(self, pkgfiles=None, trimworld=None, cleanup=True, ldpath_mtimes=None, others_in_slot=None, needed=None, @@ -3409,6 +3411,7 @@ class dblink(object): preserve_paths = set() needed = None if not (linkmap is None or plib_registry is None): + self.vartree.dbapi._fs_lock() plib_registry.lock() try: plib_registry.load() @@ -3423,6 +3426,7 @@ class dblink(object): preserve_paths = self._find_libs_to_preserve() finally: plib_registry.unlock() + self.vartree.dbapi._fs_unlock() if preserve_paths: self._add_preserve_libs_to_contents(preserve_paths) @@ -3507,6 +3511,7 @@ class dblink(object): plib_registry = self.vartree.dbapi._plib_registry if plib_registry: + self.vartree.dbapi._fs_lock() plib_registry.lock() try: plib_registry.load() @@ -3563,6 +3568,7 @@ class dblink(object): plib_registry.store() finally: plib_registry.unlock() + self.vartree.dbapi._fs_unlock() self.vartree.dbapi._add(self) contents = self.getcontents() |