From 6b114bbe9af4e883f605fb7a01d2b05c9f532c15 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 16 Jun 2008 11:16:15 +0000 Subject: Make some post_merge() things conditional on the vdb lock being held (mtimedb commit and info dirs processing). (trunk r10659) svn path=/main/branches/2.1.2/; revision=10666 --- bin/emerge | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 78f792428..6921b7d1d 100755 --- a/bin/emerge +++ b/bin/emerge @@ -6917,13 +6917,15 @@ def post_emerge(settings, 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