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 1QMEQf-0000XK-Nq for garchives@archives.gentoo.org; Tue, 17 May 2011 07:10:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE5931C2FF; Tue, 17 May 2011 07:10:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AFBE01C2FF for ; Tue, 17 May 2011 07:10:45 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 980F51B403B for ; Tue, 17 May 2011 07:10:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1009780504 for ; Tue, 17 May 2011 07:10:44 +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: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: da3cdf8a6ffd5cd69587291d75d19f1deb0e5976 Date: Tue, 17 May 2011 07:10:44 +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: 720ff29d1bd8862e059b61442ce89921 commit: da3cdf8a6ffd5cd69587291d75d19f1deb0e5976 Author: Zac Medico gentoo org> AuthorDate: Tue May 17 07:10:21 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue May 17 07:10:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dda3cdf8a --autounmask-write: use CONFIGROOT and EROOT --- pym/_emerge/depgraph.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 9f3c1ac..a2b9534 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5714,7 +5714,9 @@ class depgraph(object): problems =3D [] if write_to_file: for root in roots: - abs_user_config =3D os.path.join(root, USER_CONFIG_PATH) + settings =3D self._frozen_config.roots[root].settings + abs_user_config =3D os.path.join( + settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH) =20 if root in unstable_keyword_msg: file_to_write_to[(abs_user_config, "package.keywords")] =3D \ @@ -5739,7 +5741,10 @@ class depgraph(object): write_to_file =3D not problems =20 for root in roots: - abs_user_config =3D os.path.join(root, USER_CONFIG_PATH) + settings =3D self._frozen_config.roots[root].settings + abs_user_config =3D os.path.join( + settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH) + if len(roots) > 1: writemsg_stdout("\nFor %s:\n" % abs_user_config, noiselevel=3D-1) =20 @@ -5766,8 +5771,8 @@ class depgraph(object): protect_obj =3D {} if write_to_file: for root in roots: - settings =3D self._frozen_config.pkgsettings[root] - protect_obj[root] =3D ConfigProtect(root, \ + settings =3D self._frozen_config.roots[root].settings + protect_obj[root] =3D ConfigProtect(settings["EROOT"], \ shlex_split(settings.get("CONFIG_PROTECT", "")), shlex_split(settings.get("CONFIG_PROTECT_MASK", ""))) =20