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 1RcOFH-0004Dn-AQ for garchives@archives.gentoo.org; Sun, 18 Dec 2011 21:26:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3E7321C190; Sun, 18 Dec 2011 21:26:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 922D321C190 for ; Sun, 18 Dec 2011 21:26:03 +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 1974A1B4036 for ; Sun, 18 Dec 2011 21:26:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3B12F80042 for ; Sun, 18 Dec 2011 21:26:02 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <3427c50559cba9b488580f0b742fa2059a06e101.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/repository/config.py X-VCS-Directories: pym/portage/repository/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 3427c50559cba9b488580f0b742fa2059a06e101 Date: Sun, 18 Dec 2011 21:26:02 +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: d2021e69-abd7-4167-8095-76e85b14abc6 X-Archives-Hash: 970a7b9cf5a712e4fa640ac797ab2400 commit: 3427c50559cba9b488580f0b742fa2059a06e101 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Sun Dec 18 21:25:07 2011 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gentoo org> CommitDate: Sun Dec 18 21:25:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3427c505 RepoConfigLoader._add_overlays(): Rename a variable and add a comment. --- pym/portage/repository/config.py | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index 0f3f836..eb72070 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -321,14 +321,15 @@ class RepoConfigLoader(object): repo_opts =3D default_repo_opts.copy() repo_opts['location'] =3D ov repo =3D RepoConfig(None, repo_opts) - repo_conf_opts =3D prepos.get(repo.name) - if repo_conf_opts is not None: - if repo_conf_opts.aliases is not None: - repo.aliases =3D repo_conf_opts.aliases - if repo_conf_opts.eclass_overrides is not None: - repo.eclass_overrides =3D repo_conf_opts.eclass_overrides - if repo_conf_opts.masters is not None: - repo.masters =3D repo_conf_opts.masters + # repos_conf_opts contains options from /etc/portage/repos.conf + repos_conf_opts =3D prepos.get(repo.name) + if repos_conf_opts is not None: + if repos_conf_opts.aliases is not None: + repo.aliases =3D repos_conf_opts.aliases + if repos_conf_opts.eclass_overrides is not None: + repo.eclass_overrides =3D repos_conf_opts.eclass_overrides + if repos_conf_opts.masters is not None: + repo.masters =3D repos_conf_opts.masters =20 if repo.name in prepos: old_location =3D prepos[repo.name].location