Make some post_merge() things conditional on the vdb lock being held

(mtimedb commit and info dirs processing).

svn path=/main/trunk/; revision=10659

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 208635a0285eae12cd80a05cdfeadd4ddb75b9a7..bc34faf77656ca07ac6505acdf99ddf50722432b 100644 (file)
--- 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)