diff options
| author | Daniel Drake <dsd@laptop.org> | 2011-10-06 11:38:11 (GMT) |
|---|---|---|
| committer | Anish Mangal <anish@activitycentral.com> | 2012-01-27 12:19:25 (GMT) |
| commit | 39144184b5fde88d89893a34e73e209910ecc2c7 (patch) | |
| tree | 68b6c2b8abcdff125331899713ff732fe4890d72 | |
| parent | 03da9eb3ee24d1d0f317f1170e9f1204c75395d7 (diff) | |
repos: fix hyphen/underscore confusion
Koji repos use hyphens and it wouldn't be a good idea to rename
them all. So restrict the hyphen-to-underscore conversion for
compatibility with Fedora repo names only.
| -rw-r--r-- | modules/repos/ksmain.50.repos.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/modules/repos/ksmain.50.repos.py b/modules/repos/ksmain.50.repos.py index e1dee21..c6b3872 100644 --- a/modules/repos/ksmain.50.repos.py +++ b/modules/repos/ksmain.50.repos.py @@ -31,9 +31,18 @@ def add_to_excludes(baseurl, addexcludes): # clean up addexcludes list if addexcludes is not None: - addexcludes = addexcludes.replace('-', '_').split(',') + addexcludes = addexcludes.split(',') for idx, excl in enumerate(addexcludes): - addexcludes[idx] = excl.strip() + excl = excl.strip() + + # Support hyphenated fedora repo notation, as this matches the + # default files in /etc/yum.repos.d + if excl == 'fedora-updates-testing': + excl = 'fedora_updates_testing' + elif excl == 'fedora-updates': + excl = 'fedora_updates' + + addexcludes[idx] = excl else: addexcludes = [] |