[gentoo-portage-dev] [PATCH] --config-root command-line option

[Daniel Barkalow]

Allow PORTAGE_CONFIGROOT to be set as a command-line option. It can be 
annoying to get environment variables to emerge, particularly when you 
need sudo and you only want the environment variable some of the time.

Also cleans up parsing of options which have to be parsed before the 
command line that includes EMERGE_DEFAULT_OPTS is assembled.

Signed-off-by: Daniel Barkalow <barkalow@××××××××.org>

Index: bin/emerge
===================================================================
--- bin/emerge	(revision 5054)
+++ bin/emerge	(working copy)
@@ -4193,6 +4193,26 @@
 	sys.stderr.write("!!! '%s' or '%s'\n\n" % (action1, action2))
 	sys.exit(1)
 
+def parse_early_opts(cmdline):
+	early={}
+	normal=[]
+	for i in cmdline:
+		isearly = False
+		if i in ["--ignore-default-opts"]:
+			isearly = True
+		for opt in ["--config-root"]:
+			if i.startswith(opt + "="):
+				isearly = True
+		if isearly:
+			if "=" in i:
+				idx = i.index("=")
+				early[i[:idx]] = i[idx+1:]
+			else:
+				early[i]=True
+		else:
+			normal.append(i)
+	return early, normal
+
 def parse_opts(tmpcmdline):
 	myaction=None
 	myopts = {}
@@ -4286,10 +4306,12 @@
 			sys.exit(9)
 		del myroot, mysettings
 
-def load_emerge_config(trees=None):
+def load_emerge_config(trees=None, config_root=None):
 	kwargs = {}
 	for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), ("target_root", "ROOT")):
 		kwargs[k] = os.environ.get(envvar, "/")
+	if config_root:
+		kwargs["config_root"] = config_root
 	trees = portage.create_trees(trees=trees, **kwargs)
 
 	settings = trees["/"]["vartree"].settings
@@ -4389,12 +4411,19 @@
 def emerge_main():
 	# Portage needs to ensure a sane umask for the files it creates.
 	os.umask(022)
-	settings, trees, mtimedb = load_emerge_config()
+
+	earlyopts, normalopts = parse_early_opts(sys.argv[1:])
+
+	config_root_opt = None
+	if "--config-root" in earlyopts:
+		config_root_opt = earlyopts["--config-root"]
+	
+	settings, trees, mtimedb = load_emerge_config(config_root=config_root_opt)
 	portdb = trees[settings["ROOT"]]["porttree"].dbapi
 	if portage.global_updates(settings, trees, mtimedb["updates"]):
 		mtimedb.commit()
 		# Reload the whole config from scratch.
-		settings, trees, mtimedb = load_emerge_config(trees=trees)
+		settings, trees, mtimedb = load_emerge_config(trees=trees, config_root=config_root_opt)
 		portdb = trees[settings["ROOT"]]["porttree"].dbapi
 
 	ldpath_mtimes = mtimedb["ldpath"]
@@ -4414,9 +4443,9 @@
 		nocolor()
 
 	tmpcmdline = []
-	if "--ignore-default-opts" not in sys.argv:
+	if "--ignore-default-opts" not in earlyopts:
 		tmpcmdline.extend(settings["EMERGE_DEFAULT_OPTS"].split())
-	tmpcmdline.extend(sys.argv[1:])
+	tmpcmdline.extend(normalopts)
 	myaction, myopts, myfiles = parse_opts(tmpcmdline)
 
 	for myroot in trees:
-- 
gentoo-portage-dev@g.o mailing list