Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 192778 | Differences between
and this patch

Collapse All | Expand All

(-)pym/_emerge/__init__.py (+11 lines)
Lines 8-13 Link Here
8
from collections import deque
8
from collections import deque
9
import fcntl
9
import fcntl
10
import formatter
10
import formatter
11
import glob
11
import logging
12
import logging
12
import pwd
13
import pwd
13
import select
14
import select
Lines 15714-15719 Link Here
15714
15715
15715
	apply_priorities(settings)
15716
	apply_priorities(settings)
15716
15717
15718
	vdb_path = os.path.join(trees[settings["ROOT"]]["root_config"].trees["vartree"].root, portage.VDB_PATH)
15719
	base, tail = os.path.split(vdb_path)
15720
	if not os.access(os.path.join(base, "." + tail + ".portage_lockfile"), os.F_OK):
15721
		merging_directories = glob.glob(os.path.join(vdb_path, "*", "-MERGING-*"))
15722
		if merging_directories:
15723
			print colorize("BAD", "!!! -MERGING- directories have been found:\n")
15724
			for dir in merging_directories:
15725
				print colorize("BAD", "    " + dir)
15726
			print colorize("BAD", "\n!!! Please remove these directories and reinstall appropriate packages.")
15727
15717
	spinner = stdout_spinner()
15728
	spinner = stdout_spinner()
15718
	if "candy" in settings.features:
15729
	if "candy" in settings.features:
15719
		spinner.update = spinner.update_scroll
15730
		spinner.update = spinner.update_scroll

Return to bug 192778