Index: pym/_emerge/__init__.py =================================================================== --- pym/_emerge/__init__.py (revision 13353) +++ pym/_emerge/__init__.py (working copy) @@ -8,6 +8,7 @@ from collections import deque import fcntl import formatter +import glob import logging import pwd import select @@ -15714,6 +15715,16 @@ apply_priorities(settings) + vdb_path = os.path.join(trees[settings["ROOT"]]["root_config"].trees["vartree"].root, portage.VDB_PATH) + base, tail = os.path.split(vdb_path) + if not os.access(os.path.join(base, "." + tail + ".portage_lockfile"), os.F_OK): + merging_directories = glob.glob(os.path.join(vdb_path, "*", "-MERGING-*")) + if merging_directories: + print colorize("BAD", "!!! -MERGING- directories have been found:\n") + for dir in merging_directories: + print colorize("BAD", " " + dir) + print colorize("BAD", "\n!!! Please remove these directories and reinstall appropriate packages.") + spinner = stdout_spinner() if "candy" in settings.features: spinner.update = spinner.update_scroll