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 1RwLG1-0005nJ-3x for garchives@archives.gentoo.org; Sat, 11 Feb 2012 22:17:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D373AE06A1; Sat, 11 Feb 2012 22:17:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 953BDE06A1 for ; Sat, 11 Feb 2012 22:17:16 +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 E06651B4004 for ; Sat, 11 Feb 2012 22:17:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8F5DBE53FF for ; Sat, 11 Feb 2012 22:17:14 +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: <7f605a874487e42b856d9a2ffd30fc0e587bae3f.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/MetadataRegen.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 7f605a874487e42b856d9a2ffd30fc0e587bae3f Date: Sat, 11 Feb 2012 22:17:14 +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: ad381b5a-1911-4d08-bcf3-88b4dc3f68a0 X-Archives-Hash: 999658310a1b6244602084a2dff2a0fa commit: 7f605a874487e42b856d9a2ffd30fc0e587bae3f Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Feb 11 22:14:43 2012 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gmail = com> CommitDate: Sat Feb 11 22:14:43 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7f605a87 _emerge.MetadataRegen.MetadataRegen._iter_metadata_processes(): Regenerate metadata for given cpv in each repository. --- pym/_emerge/MetadataRegen.py | 44 +++++++++++++++++++++---------------= ----- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py index efe3004..e0c8092 100644 --- a/pym/_emerge/MetadataRegen.py +++ b/pym/_emerge/MetadataRegen.py @@ -1,8 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 import portage from portage import os +from portage.dep import _repo_separator from _emerge.EbuildMetadataPhase import EbuildMetadataPhase from _emerge.PollScheduler import PollScheduler =20 @@ -61,26 +62,27 @@ class MetadataRegen(PollScheduler): break cp_set.add(cp) portage.writemsg_stdout("Processing %s\n" % cp) - cpv_list =3D portdb.cp_list(cp) - for cpv in cpv_list: - if self._terminated_tasks: - break - valid_pkgs.add(cpv) - ebuild_path, repo_path =3D portdb.findname2(cpv) - if ebuild_path is None: - raise AssertionError("ebuild not found for '%s'" % cpv) - metadata, ebuild_hash =3D portdb._pull_valid_cache( - cpv, ebuild_path, repo_path) - if metadata is not None: - if consumer is not None: - consumer(cpv, repo_path, metadata, ebuild_hash) - continue - - yield EbuildMetadataPhase(cpv=3Dcpv, - ebuild_hash=3Debuild_hash, - metadata_callback=3Dportdb._metadata_callback, - portdb=3Dportdb, repo_path=3Drepo_path, - settings=3Dportdb.doebuild_settings) + for repo in portdb.repositories: + cpv_list =3D portdb.cp_list(cp, mytree=3D[repo.location]) + for cpv in cpv_list: + if self._terminated_tasks: + break + valid_pkgs.add(cpv) + ebuild_path, repo_path =3D portdb.findname2(cpv, myrepo=3Drepo.name= ) + if ebuild_path is None: + raise AssertionError("ebuild not found for '%s%s%s'" % (cpv, _repo= _separator, repo.name)) + metadata, ebuild_hash =3D portdb._pull_valid_cache( + cpv, ebuild_path, repo_path) + if metadata is not None: + if consumer is not None: + consumer(cpv, repo_path, metadata, ebuild_hash) + continue + + yield EbuildMetadataPhase(cpv=3Dcpv, + ebuild_hash=3Debuild_hash, + metadata_callback=3Dportdb._metadata_callback, + portdb=3Dportdb, repo_path=3Drepo_path, + settings=3Dportdb.doebuild_settings) =20 def _keep_scheduling(self): return self._remaining_tasks and not self._terminated_tasks