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 1SeGPN-0008VU-3Z for garchives@archives.gentoo.org; Tue, 12 Jun 2012 02:00:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ACC6E031D; Tue, 12 Jun 2012 02:00:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EEE00E031D for ; Tue, 12 Jun 2012 02:00:28 +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 5CAA21B4011 for ; Tue, 12 Jun 2012 02:00:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F2F93E5430 for ; Tue, 12 Jun 2012 02:00:26 +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: <1339466409.3a1575118627e0145cda09e93f5a076f3ec66feb.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3a1575118627e0145cda09e93f5a076f3ec66feb X-VCS-Branch: master Date: Tue, 12 Jun 2012 02:00:26 +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: 991b2b33-fd32-4f91-8d47-f3b0f2daeefc X-Archives-Hash: 620491ce159c6c23f04355bd192388dd commit: 3a1575118627e0145cda09e93f5a076f3ec66feb Author: Zac Medico gentoo org> AuthorDate: Tue Jun 12 02:00:09 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jun 12 02:00:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3a157511 config: pass tolerant param to getconfig more --- pym/portage/package/ebuild/config.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e= build/config.py index 21fc1d5..2fa799f 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -328,7 +328,7 @@ class config(object): # lead to unexpected results. =20 env_d =3D getconfig(os.path.join(eroot, "etc", "profile.env"), - expand=3DFalse) or {} + tolerant=3Dtolerant, expand=3DFalse) or {} expand_map =3D env_d.copy() self._expand_map =3D expand_map =20 @@ -336,7 +336,8 @@ class config(object): expand_map["EPREFIX"] =3D eprefix =20 make_globals =3D getconfig(os.path.join( - self.global_config_path, 'make.globals'), expand=3Dexpand_map) + self.global_config_path, 'make.globals'), + tolerant=3Dtolerant, expand=3Dexpand_map) if make_globals is None: make_globals =3D {} =20 @@ -463,7 +464,8 @@ class config(object): mygcfg =3D {} if self.profiles: mygcfg_dlists =3D [getconfig(os.path.join(x, "make.defaults"), - expand=3Dexpand_map) for x in self.profiles] + tolerant=3Dtolerant, expand=3Dexpand_map) + for x in self.profiles] self._make_defaults =3D mygcfg_dlists mygcfg =3D stack_dicts(mygcfg_dlists, incrementals=3Dself.incrementals) @@ -580,7 +582,7 @@ class config(object): self._repo_make_defaults =3D {} for repo in self.repositories.repos_with_profiles(): d =3D getconfig(os.path.join(repo.location, "profiles", "make.defaul= ts"), - expand=3Dself.configdict["globals"].copy()) or {} + tolerant=3Dtolerant, expand=3Dself.configdict["globals"].copy()) or= {} if d: for k in chain(self._env_blacklist, profile_only_variables, self._global_only_vars): @@ -1868,7 +1870,8 @@ class config(object): """Reload things like /etc/profile.env that can change during runtime.= """ env_d_filename =3D os.path.join(self["EROOT"], "etc", "profile.env") self.configdict["env.d"].clear() - env_d =3D getconfig(env_d_filename, expand=3DFalse) + env_d =3D getconfig(env_d_filename, + tolerant=3Dself._tolerant, expand=3DFalse) if env_d: # env_d will be None if profile.env doesn't exist. for k in self._env_d_blacklist: