From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 26283138236 for ; Wed, 2 Jan 2013 00:30:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F15B1E0605; Wed, 2 Jan 2013 00:30:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7632AE0605 for ; Wed, 2 Jan 2013 00:30: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 60F9E33BF55 for ; Wed, 2 Jan 2013 00:30:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E99D0E5439 for ; Wed, 2 Jan 2013 00:30:25 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1357086485.63bf20d0925ca76c98477a108a6d4c3fa8fde885.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 63bf20d0925ca76c98477a108a6d4c3fa8fde885 X-VCS-Branch: master Date: Wed, 2 Jan 2013 00:30:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 72a92baa-07bd-432e-90ad-9ff0d1603c42 X-Archives-Hash: 73cf8227b6103cb7d822fc38fbb5d5a1 commit: 63bf20d0925ca76c98477a108a6d4c3fa8fde885 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Jan 1 14:15:39 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jan 2 00:28:05 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=63bf20d0 repoman: tell user which mirror identifiers contain SRC_URI before the patch: $ repoman full RepoMan scours the neighborhood... metadata.missing 1 dev-haskell/qthaskellc/metadata.xml SRC_URI.mirror 1 dev-haskell/qthaskellc/qthaskellc-1.1.4.ebuild: 'http://download.berlios.de/' found in thirdpartymirrors after the patch: $ repoman full RepoMan scours the neighborhood... metadata.missing 1 dev-haskell/qthaskellc/metadata.xml SRC_URI.mirror 1 dev-haskell/qthaskellc/qthaskellc-1.1.4.ebuild: 'http://download.berlios.de/' found in thirdpartymirrors: 'mirror://berlios' Signed-off-by: Sergei Trofimovich gentoo.org> --- bin/repoman | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/repoman b/bin/repoman index 45a7ca5..92ae667 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1267,12 +1267,12 @@ check_ebuild_notadded = not \ (vcs == "svn" and repolevel < 3 and options.mode != "commit") # Build a regex from thirdpartymirrors for the SRC_URI.mirror check. -thirdpartymirrors = [] -for v in repoman_settings.thirdpartymirrors().values(): +thirdpartymirrors = {} +for k, v in repoman_settings.thirdpartymirrors().items(): for v in v: if not v.endswith("/"): v += "/" - thirdpartymirrors.append(v) + thirdpartymirrors[v] = k class _MetadataTreeBuilder(xml.etree.ElementTree.TreeBuilder): """ @@ -1772,7 +1772,7 @@ for x in effective_scanlist: for uri in portage.dep.use_reduce( \ myaux["SRC_URI"], matchall=True, is_src_uri=True, eapi=eapi, flat=True): contains_mirror = False - for mirror in thirdpartymirrors: + for mirror, mirror_alias in thirdpartymirrors.items(): if uri.startswith(mirror): contains_mirror = True break @@ -1781,8 +1781,8 @@ for x in effective_scanlist: stats["SRC_URI.mirror"] += 1 fails["SRC_URI.mirror"].append( - "%s: '%s' found in thirdpartymirrors" % \ - (relative_path, mirror)) + "%s: '%s' found in thirdpartymirrors: 'mirror://%s'" % \ + (relative_path, mirror, mirror_alias)) if myaux.get("PROVIDE"): stats["virtual.oldstyle"]+=1