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-381854-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1R3L3i-0002Dq-7F
for garchives@archives.gentoo.org; Tue, 13 Sep 2011 04:57:25 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B583821C04B;
Tue, 13 Sep 2011 04:57:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 813F621C04B
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Sep 2011 04:57:14 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0A57E1B4010
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Sep 2011 04:57:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 24BFA80042
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Sep 2011 04:57:13 +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: <7bd285079a6b66fbf7548d040af800ce0b51f0ae.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/ebuild
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 7bd285079a6b66fbf7548d040af800ce0b51f0ae
Date: Tue, 13 Sep 2011 04:57:13 +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:
X-Archives-Hash: 66f5746fdf78122593bf3296df924e89
commit: 7bd285079a6b66fbf7548d040af800ce0b51f0ae
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 04:56:48 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 04:56:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D7bd28507
ebuild(1): avoid "Location not set for repo" msgs
When overriding PORTDIR_OVERLAY, we can avoid "Location not set for
repository" messages if we include the original PORTDIR_OVERLAY paths
in the overridden setting.
---
bin/ebuild | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/bin/ebuild b/bin/ebuild
index 92105bb..1408dd3 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -134,13 +134,19 @@ vdb_path =3D os.path.realpath(os.path.join(portage.=
settings['EROOT'], VDB_PATH))
# Make sure that portdb.findname() returns the correct ebuild.
if ebuild_portdir !=3D vdb_path and \
ebuild_portdir not in portage.portdb.porttrees:
+ portdir_overlay =3D os.environ.get("PORTDIR_OVERLAY")
+ if portdir_overlay is None:
+ portdir_overlay =3D portage.settings.get("PORTDIR_OVERLAY")
+ if portdir_overlay is None:
+ portdir_overlay =3D ""
if sys.hexversion >=3D 0x3000000:
os.environ["PORTDIR_OVERLAY"] =3D \
- os.environ.get("PORTDIR_OVERLAY","") + \
+ portdir_overlay + \
" " + _shell_quote(ebuild_portdir)
else:
os.environ["PORTDIR_OVERLAY"] =3D \
- os.environ.get("PORTDIR_OVERLAY","") + \
+ _unicode_encode(portdir_overlay,
+ encoding=3D_encodings['content'], errors=3D'strict') + \
" " + _unicode_encode(_shell_quote(ebuild_portdir),
encoding=3D_encodings['content'], errors=3D'strict')
=20