| 1 |
commit: 05231093d7ab7b38f82f99d5ed6164f0dc40ab55 |
| 2 |
Author: Tom Wijsman <tomwij <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 2 16:24:03 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Oct 1 23:45:32 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=05231093 |
| 7 |
|
| 8 |
repoman/checks/ebuild/thirdpartymirrors.py: Fix logic |
| 9 |
|
| 10 |
--- |
| 11 |
pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------ |
| 12 |
1 file changed, 8 insertions(+), 6 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py |
| 15 |
index cce61f6..f867c19 100644 |
| 16 |
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py |
| 17 |
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py |
| 18 |
@@ -5,13 +5,15 @@ import portage |
| 19 |
class ThirdPartyMirrors(object): |
| 20 |
|
| 21 |
def __init__(self, repoman_settings, qatracker): |
| 22 |
- # Build a regex from thirdpartymirrors for the SRC_URI.mirror check. |
| 23 |
+ # TODO: Build a regex instead here, for the SRC_URI.mirror check. |
| 24 |
self.thirdpartymirrors = {} |
| 25 |
- for k, v in repoman_settings.thirdpartymirrors().items(): |
| 26 |
- for v in v: |
| 27 |
- if not v.endswith("/"): |
| 28 |
- v += "/" |
| 29 |
- self.thirdpartymirrors[v] = k |
| 30 |
+ profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items() |
| 31 |
+ for mirror_alias, mirrors in profile_thirdpartymirrors: |
| 32 |
+ for mirror in mirrors: |
| 33 |
+ if not mirror.endswith("/"): |
| 34 |
+ mirror += "/" |
| 35 |
+ self.thirdpartymirrors[mirror] = mirror_alias |
| 36 |
+ |
| 37 |
self.qatracker = qatracker |
Archives