summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-16 08:32:54 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-16 08:32:54 +0000
commit3244389344bcfde7b2743e244118eb9853e84fae (patch)
treec9ecbe1ca5e323fc3f96e9b59acceac89c4786b4
parent46d84b1283e73cb9280aae735a155a7c5a6da3d3 (diff)
downloadportage-3244389344bcfde7b2743e244118eb9853e84fae.tar.gz
portage-3244389344bcfde7b2743e244118eb9853e84fae.tar.bz2
portage-3244389344bcfde7b2743e244118eb9853e84fae.zip
Make some post_merge() things conditional on the vdb lock being held
(mtimedb commit and info dirs processing). svn path=/main/trunk/; revision=10659
-rw-r--r--pym/_emerge/__init__.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 208635a02..bc34faf77 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -6933,13 +6933,16 @@ def post_emerge(trees, mtimedb, retval):
vdb_lock = None
if os.access(vdb_path, os.W_OK):
vdb_lock = portage.locks.lockdir(vdb_path)
- try:
- if "noinfo" not in settings.features:
- chk_updated_info_files(target_root, infodirs, info_mtimes, retval)
- mtimedb.commit()
- finally:
- if vdb_lock:
- portage.locks.unlockdir(vdb_lock)
+
+ if vdb_lock:
+ try:
+ if "noinfo" not in settings.features:
+ chk_updated_info_files(target_root,
+ infodirs, info_mtimes, retval)
+ mtimedb.commit()
+ finally:
+ if vdb_lock:
+ portage.locks.unlockdir(vdb_lock)
chk_updated_cfg_files(target_root, config_protect)