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 7C3A51386F1 for ; Mon, 10 Aug 2015 14:45:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0917C142F9; Mon, 10 Aug 2015 14:45:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39C6B142F6 for ; Mon, 10 Aug 2015 14:45:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8519A340943 for ; Mon, 10 Aug 2015 14:45:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 499EC147 for ; Mon, 10 Aug 2015 14:45:31 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1439217919.b45055aaa0b4120cbbe5186cb52ee1ff5695e1b5.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/checks/ebuilds/thirdpartymirrors.py X-VCS-Directories: pym/repoman/checks/ebuilds/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b45055aaa0b4120cbbe5186cb52ee1ff5695e1b5 X-VCS-Branch: repoman Date: Mon, 10 Aug 2015 14:45:31 +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: 93ac0ff4-2dd2-42d1-b749-96fc785f9fa2 X-Archives-Hash: 2824ce1be624acced067b193cc9d6b34 commit: b45055aaa0b4120cbbe5186cb52ee1ff5695e1b5 Author: Tom Wijsman gentoo org> AuthorDate: Mon Jun 2 16:24:03 2014 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Aug 10 14:45:19 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b45055aa repoman/checks/ebuild/thirdpartymirrors.py: Fix logic pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py index cce61f6..f867c19 100644 --- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py +++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py @@ -5,13 +5,15 @@ import portage class ThirdPartyMirrors(object): def __init__(self, repoman_settings, qatracker): - # Build a regex from thirdpartymirrors for the SRC_URI.mirror check. + # TODO: Build a regex instead here, for the SRC_URI.mirror check. self.thirdpartymirrors = {} - for k, v in repoman_settings.thirdpartymirrors().items(): - for v in v: - if not v.endswith("/"): - v += "/" - self.thirdpartymirrors[v] = k + profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items() + for mirror_alias, mirrors in profile_thirdpartymirrors: + for mirror in mirrors: + if not mirror.endswith("/"): + mirror += "/" + self.thirdpartymirrors[mirror] = mirror_alias + self.qatracker = qatracker