Python does not use POSIX character classes in its re module.
Also added '/' to the host exclusion character class so that
a path would not be included with the host when there is no port.
Resolves: rhbz#602712
---
yuminstall.py | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/yuminstall.py b/yuminstall.py
index 603e145..0bd1608 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -711,8 +711,12 @@ class AnacondaYum(YumSorter):
extraRepos.append(repo)
if self.anaconda.isKickstart:
- # This is the same pattern as from loader/urls.c:splitProxyParam.
- pattern = re.compile("([[:alpha:]]+://)?(([[:alnum:]]+)(:[^:@]+)?@)?([^:]+)(:[[:digit:]]+)?(/.*)?")
+ # This is the same pattern as from loader/urls.c:splitProxyParam except that
+ # the POSIX classes have been replaced with character ranges
+ # NOTE: If this changes, update tests/regex/proxy.py
+ #
+ # proxy=[protocol://][username[:password]@]host[:port][path]
+ pattern = re.compile("([A-Za-z]+://)?(([A-Za-z0-9]+)(:[^:@]+)?@)?([^:/]+)(:[0-9]+)?(/.*)?")
for ksrepo in self.anaconda.id.ksdata.repo.repoList:
anacondaBaseURLs = [ksrepo.baseurl]
--
1.7.0.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
