From 96506ec5eeb9a747625e89c4f804370c6dedce2b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 27 Sep 2007 17:54:34 +0000 Subject: Bug #194025 - Lock /var/db/pkg in post_merge() during the "Regenerating GNU info directory index" routine. svn path=/main/trunk/; revision=7853 --- pym/emerge/__init__.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'pym/emerge/__init__.py') diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 840a750e3..87ef8ad1b 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -4502,8 +4502,15 @@ def post_emerge(trees, 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) @@ -4518,8 +4525,7 @@ def post_emerge(trees, mtimedb, retval): print colorize("WARN", " * ") + " - %s" % f print "Use " + colorize("GOOD", "revdep-rebuild") + " to rebuild packages using these libraries" print "and then remerge the packages listed above." - - mtimedb.commit() + sys.exit(retval) -- cgit v1.2.3-1-g7c22