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 1RCylQ-0001iK-V1 for garchives@archives.gentoo.org; Sun, 09 Oct 2011 19:10:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1638721C233; Sun, 9 Oct 2011 19:10:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C95A321C231 for ; Sun, 9 Oct 2011 19:10:03 +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 3AE681B4002 for ; Sun, 9 Oct 2011 19:10:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 39F8D8004F for ; Sun, 9 Oct 2011 19:10:02 +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: <80a9cd59ed8df549ff0991705040d5270c8d0d03.zmedico@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: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 80a9cd59ed8df549ff0991705040d5270c8d0d03 Date: Sun, 9 Oct 2011 19:10: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: X-Archives-Hash: b06682e859b348894132c71a0ea3d23a commit: 80a9cd59ed8df549ff0991705040d5270c8d0d03 Author: Zac Medico gentoo org> AuthorDate: Sun Oct 9 19:09:22 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 9 19:09:22 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D80a9cd59 Revert "RepoConfigLoader: Recursively expand masters." This reverts commit ab2a6cc357ba3c8272a4a1556e2c0bcd4bee102e. Reverting all masters recursion code for now (see bug #386569). --- pym/portage/repository/config.py | 48 ++++++++++++++++----------------= ----- 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index 1d042ac..8f55177 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -484,38 +484,32 @@ class RepoConfigLoader(object): self._prepos_changed =3D True self._repo_location_list =3D [] =20 - def get_masters(repo_name, repo, recurse=3DTrue): - master_repos =3D [] + #The 'masters' key currently contains repo names. Replace them with th= e matching RepoConfig. + for repo_name, repo in prepos.items(): + if repo_name =3D=3D "DEFAULT": + continue if repo.masters is None: if self.mainRepo() and repo_name !=3D self.mainRepo().name: - master_repos =3D [self.mainRepo()] + repo.masters =3D self.mainRepo(), else: - master_repos =3D [] + repo.masters =3D () else: - for master in repo.masters: - if isinstance(master, RepoConfig): - master_repos.append(master) + if repo.masters and isinstance(repo.masters[0], RepoConfig): + # This one has already been processed + # because it has an alias. + continue + master_repos =3D [] + for master_name in repo.masters: + if master_name not in prepos: + layout_filename =3D os.path.join(repo.user_location, + "metadata", "layout.conf") + writemsg_level(_("Unavailable repository '%s' " \ + "referenced by masters entry in '%s'\n") % \ + (master_name, layout_filename), + level=3Dlogging.ERROR, noiselevel=3D-1) else: - if master not in prepos: - layout_filename =3D os.path.join(repo.user_location, - "metadata", "layout.conf") - writemsg_level(_("Unavailable repository '%s' " \ - "referenced by masters entry in '%s'\n") % \ - (master_name, layout_filename), - level=3Dlogging.ERROR, noiselevel=3D-1) - else: - master =3D prepos[master] - if recurse: - master_repos.extend(get_masters(master.name, master) + [master]) - else: - master_repos.append(master) - return master_repos - - #The 'masters' key currently contains repo names. Replace them with th= e matching RepoConfig. - for repo_name, repo in prepos.items(): - if repo_name =3D=3D "DEFAULT": - continue - repo.masters =3D tuple(get_masters(repo_name, repo)) + master_repos.append(prepos[master_name]) + repo.masters =3D tuple(master_repos) =20 #The 'eclass_overrides' key currently contains repo names. Replace the= m with the matching repo paths. for repo_name, repo in prepos.items():