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 ) id 1RZLnF-0004nY-9G for garchives@archives.gentoo.org; Sat, 10 Dec 2011 12:12:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C07B321C02E; Sat, 10 Dec 2011 12:12:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 91EC221C02E for ; Sat, 10 Dec 2011 12:12:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12C771B4041 for ; Sat, 10 Dec 2011 12:12:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7B22C80042 for ; Sat, 10 Dec 2011 12:12:32 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <474d90ae979a40248362d5c4781b141f11acaac0.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/data.py X-VCS-Directories: pym/portage/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 474d90ae979a40248362d5c4781b141f11acaac0 Date: Sat, 10 Dec 2011 12:12:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 7100ef80-a756-49cb-8a0d-07077422ea63 X-Archives-Hash: 03e3f34152fa3d361cdc1d41b3c3488d commit: 474d90ae979a40248362d5c4781b141f11acaac0 Author: Fabian Groffen gentoo org> AuthorDate: Sat Dec 10 12:12:17 2011 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Dec 10 12:12:17 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D474d90ae _get_global: fix up late night screwup --- pym/portage/data.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/data.py b/pym/portage/data.py index 196e5dc..e25b545 100644 --- a/pym/portage/data.py +++ b/pym/portage/data.py @@ -155,10 +155,10 @@ def _get_global(k): v =3D env.get('PORTAGE_GRPNAME', PORTAGE_GROUPNAME) # END PREFIX LOCAL elif k =3D=3D '_portage_uname': + env =3D getattr(portage, 'settings', os.environ) # PREFIX LOCAL: use var iso hardwired 'portage' - env =3D getattr(portage, 'settings', PORTAGE_USERNAME) + v =3D env.get('PORTAGE_USERNAME', PORTAGE_USERNAME) # END PREFIX LOCAL - v =3D env.get('PORTAGE_USERNAME', 'portage') else: raise AssertionError('unknown name: %s' % k) =20