From 3244389344bcfde7b2743e244118eb9853e84fae Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 16 Jun 2008 08:32:54 +0000 Subject: Make some post_merge() things conditional on the vdb lock being held (mtimedb commit and info dirs processing). svn path=/main/trunk/; revision=10659 --- pym/_emerge/__init__.py | 17 ++++++++++------- 1 file 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) -- cgit v1.2.3-1-g7c22