[gentoo-commits] portage r13425 - in main/branches/2.1.6: man pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-04-30 06:47:20 +0000 (Thu, 30 Apr 2009)
New Revision: 13425

Modified:
   main/branches/2.1.6/man/emerge.1
   main/branches/2.1.6/pym/_emerge/__init__.py
Log:
Add a --root option that sets $ROOT (complements the --config-root option).
(trunk r13246)

Modified: main/branches/2.1.6/man/emerge.1
===================================================================
--- main/branches/2.1.6/man/emerge.1	2009-04-30 06:47:03 UTC (rev 13424)
+++ main/branches/2.1.6/man/emerge.1	2009-04-30 06:47:20 UTC (rev 13425)
@@ -424,6 +424,9 @@
 not trigger reinstallation when flags that the user has not
 enabled are added or removed.
 .TP
+.BR \-\-root=DIR
+Set the \fBROOT\fR environment variable.
+.TP
 .BR "\-\-root\-deps"
 Install build\-time dependencies to \fBROOT\fR instead of /. This option
 should not be enabled under normal circumstances. For currently supported
@@ -485,7 +488,8 @@
 .TP
 \fBROOT\fR = \fI[path]\fR
 Use \fBROOT\fR to specify the target root filesystem to be used for
-merging packages or ebuilds.  This variable can be set in \fBmake.conf\fR(5).
+merging packages or ebuilds. This variable can be set via the \fB\-\-root\fR
+option or in \fBmake.conf\fR(5) (the command line overrides other settings).
 .br
 Defaults to /.
 .TP

Modified: main/branches/2.1.6/pym/_emerge/__init__.py
===================================================================
--- main/branches/2.1.6/pym/_emerge/__init__.py	2009-04-30 06:47:03 UTC (rev 13424)
+++ main/branches/2.1.6/pym/_emerge/__init__.py	2009-04-30 06:47:20 UTC (rev 13425)
@@ -14445,7 +14445,11 @@
 			"help":"specify conditions to trigger package reinstallation",
 			"type":"choice",
 			"choices":["changed-use"]
-		}
+		},
+		"--root": {
+		 "help"   : "specify the target root filesystem for merging packages",
+		 "action" : "store"
+		},
 	}
 
 	from optparse import OptionParser
@@ -14838,6 +14842,8 @@
 		os.environ["PORTAGE_DEBUG"] = "1"
 	if "--config-root" in myopts:
 		os.environ["PORTAGE_CONFIGROOT"] = myopts["--config-root"]
+	if "--root" in myopts:
+		os.environ["ROOT"] = myopts["--root"]
 
 	# Portage needs to ensure a sane umask for the files it creates.
 	os.umask(022)