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 1QxwSd-0008D2-Jz for garchives@archives.gentoo.org; Mon, 29 Aug 2011 07:40:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B88321C122; Mon, 29 Aug 2011 07:40:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1A6E921C122 for ; Mon, 29 Aug 2011 07:40:30 +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 7FD5D1B40D0 for ; Mon, 29 Aug 2011 07:40:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A251280040 for ; Mon, 29 Aug 2011 07:40:28 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <35d900fab79b934517a2bf611bd919cb6a99aa7d.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/env_update.py X-VCS-Directories: pym/portage/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 35d900fab79b934517a2bf611bd919cb6a99aa7d Date: Mon, 29 Aug 2011 07:40:28 +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: X-Archives-Hash: 830f6ae222d6871ca246a46a51f2888c commit: 35d900fab79b934517a2bf611bd919cb6a99aa7d Author: Zac Medico gentoo org> AuthorDate: Mon Aug 29 07:40:11 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Aug 29 07:40:11 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D35d900fa env_update: fix CHOST/CBUILD ldconfig code This code never worked (since it was added in commit 751893b0272561eb9274110a474d5436a7d2bc76) due to a name collision between the env argument and another variable with the same name. --- pym/portage/util/env_update.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update= .py index 3dc84d4..d47c69e 100644 --- a/pym/portage/util/env_update.py +++ b/pym/portage/util/env_update.py @@ -46,7 +46,9 @@ def env_update(makelinks=3D1, target_root=3DNone, prev_= mtimes=3DNone, contents=3DNone, if prev_mtimes is None: prev_mtimes =3D portage.mtimedb["ldpath"] if env is None: - env =3D os.environ + settings =3D os.environ + else: + settings =3D env =20 eprefix =3D env.get("EPREFIX", "") eprefix_lstrip =3D eprefix.lstrip(os.sep) @@ -245,9 +247,9 @@ def env_update(makelinks=3D1, target_root=3DNone, pre= v_mtimes=3DNone, contents=3DNone, makelinks =3D False =20 ldconfig =3D "/sbin/ldconfig" - if "CHOST" in env and "CBUILD" in env and \ - env["CHOST"] !=3D env["CBUILD"]: - ldconfig =3D find_binary("%s-ldconfig" % env["CHOST"]) + if "CHOST" in settings and "CBUILD" in settings and \ + settings["CHOST"] !=3D settings["CBUILD"]: + ldconfig =3D find_binary("%s-ldconfig" % settings["CHOST"]) =20 # Only run ldconfig as needed if (ld_cache_update or makelinks) and ldconfig and not eprefix: