From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Sat, 13 Jul 2013 09:35:18 +0000 (+0200)
Subject: egencache: Support --repositories-configuration option.
X-Git-Tag: v2.2.0_alpha189~60
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c3f81a00732df9e7520568e2bc4922e9111d005;p=portage.git

egencache: Support --repositories-configuration option.
---

diff --git a/bin/egencache b/bin/egencache
index 71f012a7a..2c5dddce9 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -108,11 +108,14 @@ def parse_args(args):
 		help="override the PORTAGE_GPG_KEY variable",
 		dest="gpg_key")
 	common.add_option("--portdir",
-		help="override the portage tree location",
+		help="override the portage tree location (deprecated in favor of --repositories-configuration)",
 		dest="portdir")
 	common.add_option("--portdir-overlay",
-		help="override the PORTDIR_OVERLAY variable (requires that --repo is also specified)",
+		help="override the PORTDIR_OVERLAY variable (requires that --repo is also specified) (deprecated in favor of --repositories-configuration)",
 		dest="portdir_overlay")
+	common.add_option("--repositories-configuration",
+		help="override configuration of repositories (in format of repos.conf) (requires that --repo is also specified)",
+		dest="repositories_configuration")
 	common.add_option("--sign-manifests",
 		type="choice",
 		choices=('y', 'n'),
@@ -209,9 +212,11 @@ def parse_args(args):
 			parser.error("Write access denied: --cache-dir='%s'" % \
 				(options.cache_dir,))
 
-	if options.portdir_overlay is not None and \
-		options.repo is None:
-		parser.error("--portdir-overlay option requires --repo option")
+	if options.repo is None:
+		if options.repositories_configuration is not None:
+			parser.error("--repositories-configuration option requires --repo option")
+		if options.portdir_overlay is not None:
+			parser.error("--portdir-overlay option requires --repo option")
 
 	for atom in args:
 		try:
@@ -859,6 +864,8 @@ def egencache_main(args):
 
 	if options.repo is None:
 		env['PORTDIR_OVERLAY'] = ''
+	elif options.repositories_configuration is not None:
+		env['PORTAGE_REPOSITORIES'] = options.repositories_configuration
 	elif options.portdir_overlay:
 		env['PORTDIR_OVERLAY'] = options.portdir_overlay
 
diff --git a/man/egencache.1 b/man/egencache.1
index 825a300f2..81c3bbb0a 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -1,4 +1,4 @@
-.TH "EGENCACHE" "1" "May 2013" "Portage VERSION" "Portage"
+.TH "EGENCACHE" "1" "Jul 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 egencache \- generate metadata cache for ebuild repositories
 .SH "SYNOPSIS"
@@ -57,11 +57,13 @@ Also see the related \fB\-\-load\-average\fR option.
 Specifies that maximum load allowed when spawning multiple jobs.
 .TP
 .BR "\-\-portdir=PORTDIR"
-Override the portage tree location.
+Override the portage tree location. This option is deprecated in favor of
+\-\-repositories\-configuration option.
 .TP
 .BR "\-\-portdir\-overlay=PORTDIR_OVERLAY"
 Override the PORTDIR_OVERLAY variable (requires that
-\-\-repo is also specified).
+\-\-repo is also specified). This option is deprecated in favor of
+\-\-repositories\-configuration option.
 .TP
 .BR "\-\-preserve\-comments"
 Preserve the comments found in the output use.local.desc file. This requires
@@ -73,6 +75,10 @@ The name should correspond the value of a \fBrepo_name\fR entry (see
 \fBportage\fR(5)) from one of the repositories that is configured via the
 \fBPORTDIR\fR or \fBPORTDIR_OVERLAY\fR variables (see \fBmake.conf\fR(5)).
 .TP
+.BR "\-\-repositories\-configuration=REPOSITORIES_CONFIGURATION"
+Override configuration of repositories. The argument of this option has
+the same format as repos.conf (see \fBportage\fR(5)).
+.TP
 .BR "\-\-rsync"
 When used together with the \fB\-\-update\fR action, this enables a workaround
 for cases in which the content of a cache entry changes and neither the file