From 1ba6883daca0c6e96f37ca30ee51b6b20c27b98a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 27 Sep 2007 17:55:52 +0000 Subject: Bug #194025 - Lock /var/db/pkg in post_merge() during the "Regenerating GNU info directory index" routine. (trunk r7853) svn path=/main/branches/2.1.2/; revision=7854 --- bin/emerge | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 529767ebc..f5690df21 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4497,11 +4497,18 @@ def post_emerge(settings, mtimedb, retval): else: mod_echo.finalize() - if "noinfo" not in settings.features: - chk_updated_info_files(target_root, infodirs, info_mtimes, retval) + vdb_path = os.path.join(target_root, portage.VDB_PATH) + portage_util.ensure_dirs(vdb_path) + 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: + portage_locks.unlockdir(vdb_lock) chk_updated_cfg_files(target_root, config_protect) - mtimedb.commit() + sys.exit(retval) -- cgit v1.2.3-1-g7c22