From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-608901-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 74CD01381F3
for <garchives@archives.gentoo.org>; Sat, 13 Jul 2013 09:35:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1001BE0AC1;
Sat, 13 Jul 2013 09:35:59 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 840F6E0AC1
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Jul 2013 09:35:58 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2EB9D33E8C7
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Jul 2013 09:35:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id BB722E468F
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Jul 2013 09:35:55 +0000 (UTC)
From: "Arfrever Frehtes Taifersar Arahesis" <arfrever.fta@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" <arfrever.fta@gmail.com>
Message-ID: <1373708118.5c3f81a00732df9e7520568e2bc4922e9111d005.arfrever@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: man/, bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/egencache man/egencache.1
X-VCS-Directories: man/ bin/
X-VCS-Committer: arfrever
X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis
X-VCS-Revision: 5c3f81a00732df9e7520568e2bc4922e9111d005
X-VCS-Branch: master
Date: Sat, 13 Jul 2013 09:35:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 64eafc8d-d568-4f87-865f-1df52f3ef24a
X-Archives-Hash: 09af6da5ff9a9c7b7c31baf690c33942
commit: 5c3f81a00732df9e7520568e2bc4922e9111d005
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Jul 13 09:35:18 2013 +0000
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Sat Jul 13 09:35:18 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5c3f81a0
egencache: Support --repositories-configuration option.
---
bin/egencache | 17 ++++++++++++-----
man/egencache.1 | 12 +++++++++---
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/bin/egencache b/bin/egencache
index 71f012a..2c5dddc 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 825a300..81c3bbb 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