diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-16 11:16:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-16 11:16:15 +0000 |
| commit | 6b114bbe9af4e883f605fb7a01d2b05c9f532c15 (patch) | |
| tree | 1d45333589c057bdf1441c9edafe5b63cd2c9578 | |
| parent | 8d19cc8f27020d00b8992d3bf71a95e7b933dedc (diff) | |
| download | portage-6b114bbe9af4e883f605fb7a01d2b05c9f532c15.tar.gz portage-6b114bbe9af4e883f605fb7a01d2b05c9f532c15.tar.bz2 portage-6b114bbe9af4e883f605fb7a01d2b05c9f532c15.zip | |
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
| -rwxr-xr-x | bin/emerge | 16 |
1 files changed, 9 insertions, 7 deletions
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) |