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

Collapse All | Expand All

(-)a/main/tags/2.2_rc23/pym/_emerge/__init__.py (-6 / +9 lines)
Lines 12030-12037 def show_mask_docs(): Link Here
12030
def action_sync(settings, trees, mtimedb, myopts, myaction):
12030
def action_sync(settings, trees, mtimedb, myopts, myaction):
12031
	xterm_titles = "notitles" not in settings.features
12031
	xterm_titles = "notitles" not in settings.features
12032
	emergelog(xterm_titles, " === sync")
12032
	emergelog(xterm_titles, " === sync")
12033
	myportdir = settings.get("PORTDIR", None)
12034
	out = portage.output.EOutput()
12033
	out = portage.output.EOutput()
12034
12035
	myportdir = settings.get("PORTDIR", None)
12036
	syncuri = settings.get("SYNC", "").strip()
12037
12038
	if not syncuri:
12039
		writemsg_level("!!! SYNC is undefined. Is /etc/make.globals missing?\n",
12040
			noiselevel=-1, level=logging.ERROR)
12041
		return 1
12042
12035
	if not myportdir:
12043
	if not myportdir:
12036
		sys.stderr.write("!!! PORTDIR is undefined.  Is /etc/make.globals missing?\n")
12044
		sys.stderr.write("!!! PORTDIR is undefined.  Is /etc/make.globals missing?\n")
12037
		sys.exit(1)
12045
		sys.exit(1)
Lines 12068-12078 def action_sync(settings, trees, mtimedb, myopts, myaction): Link Here
12068
				umask = umask | 0020
12076
				umask = umask | 0020
12069
			spawn_kwargs["umask"] = umask
12077
			spawn_kwargs["umask"] = umask
12070
12078
12071
	syncuri = settings.get("SYNC", "").strip()
12072
	if not syncuri:
12073
		writemsg_level("!!! SYNC is undefined. Is /etc/make.globals missing?\n",
12074
			noiselevel=-1, level=logging.ERROR)
12075
		return 1
12076
12079
12077
	vcs_dirs = frozenset([".git", ".svn", "CVS", ".hg"])
12080
	vcs_dirs = frozenset([".git", ".svn", "CVS", ".hg"])
12078
	vcs_dirs = vcs_dirs.intersection(os.listdir(myportdir))
12081
	vcs_dirs = vcs_dirs.intersection(os.listdir(myportdir))

Return to bug 261381