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 B0E101389F5 for ; Mon, 17 Nov 2014 00:55:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB406E0D13; Mon, 17 Nov 2014 00:55:27 +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 2144DE0D13 for ; Mon, 17 Nov 2014 00:55:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E6B33403F9 for ; Mon, 17 Nov 2014 00:55:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B58F429FD for ; Mon, 17 Nov 2014 00:55:24 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1416185592.8f927e2d48a96331fe6a17843b4ed7bb5e66a1e1.dol-sen@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: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 8f927e2d48a96331fe6a17843b4ed7bb5e66a1e1 X-VCS-Branch: repoman Date: Mon, 17 Nov 2014 00:55:24 +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: 08e78438-6dda-4da1-8758-dbd40b719c46 X-Archives-Hash: 8a37355318195146e382214c109b22a8 commit: 8f927e2d48a96331fe6a17843b4ed7bb5e66a1e1 Author: Tom Wijsman gentoo org> AuthorDate: Mon Jun 2 16:24:03 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Mon Nov 17 00:53:12 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8f927e2d 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