From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-425727-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Rvzkf-0004El-F7
for garchives@archives.gentoo.org; Fri, 10 Feb 2012 23:19:37 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7BEDCE064A;
Fri, 10 Feb 2012 23:19:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 4F497E064A
for <gentoo-commits@lists.gentoo.org>; Fri, 10 Feb 2012 23:19:29 +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 83EC11B4024
for <gentoo-commits@lists.gentoo.org>; Fri, 10 Feb 2012 23:19:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 405FDE53FF
for <gentoo-commits@lists.gentoo.org>; Fri, 10 Feb 2012 23:19:27 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <4abd7ee534a78b78bcec8ebfdcbc023e5ba30bd3.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/repoman
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 4abd7ee534a78b78bcec8ebfdcbc023e5ba30bd3
Date: Fri, 10 Feb 2012 23:19:27 +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
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 99b853e8-de7f-47ed-b6d6-3a33e0dd1c46
X-Archives-Hash: 156897a7c77a68885bd15c5773565106
commit: 4abd7ee534a78b78bcec8ebfdcbc023e5ba30bd3
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 23:19:06 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 23:19:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D4abd7ee5
repoman: support PORTAGE_CONFIGROOT, bug 402577
---
bin/repoman | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/bin/repoman b/bin/repoman
index 7edeb65..32111bd 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -95,7 +95,8 @@ os.umask(0o22)
# behave incrementally.
repoman_incrementals =3D tuple(x for x in \
portage.const.INCREMENTALS if x !=3D 'ACCEPT_KEYWORDS')
-repoman_settings =3D portage.config(local_config=3DFalse)
+config_root =3D os.environ.get("PORTAGE_CONFIGROOT")
+repoman_settings =3D portage.config(config_root=3Dconfig_root, local_con=
fig=3DFalse)
=20
if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
repoman_settings.get('TERM') =3D=3D 'dumb' or \
@@ -563,7 +564,7 @@ repoman_settings['PORTDIR_OVERLAY'] =3D "%s %s" % \
portage._shell_quote(portdir_overlay))
# We have to call the config constructor again so
# that config.repositories is initialized correctly.
-repoman_settings =3D portage.config(local_config=3DFalse,
+repoman_settings =3D portage.config(config_root=3Dconfig_root, local_con=
fig=3DFalse,
env=3Ddict(os.environ, PORTDIR_OVERLAY=3Drepoman_settings['PORTDIR_OVER=
LAY']))
=20
root =3D repoman_settings['EROOT']
@@ -2004,6 +2005,7 @@ for x in effective_scanlist:
dep_settings =3D portage.config(
config_profile_path=3Dprof.abs_path,
config_incrementals=3Drepoman_incrementals,
+ config_root=3Dconfig_root,
local_config=3DFalse,
_unmatched_removal=3Doptions.unmatched_removal,
env=3Denv)