diff options
author | Till Maas <opensource@till.name> | 2013-03-03 18:00:23 +0100 |
---|---|---|
committer | Till Maas <opensource@till.name> | 2013-03-03 18:02:11 +0100 |
commit | 7cbba103420740edffcc9e8d050e3266d8106e03 (patch) | |
tree | 15b5fcb724486ab953522003de717cf2c7875776 /cnucnu/package_list.py | |
parent | ff3386b4ae87faacbe90ea7103a1d744eaee9589 (diff) | |
download | cnucnu-7cbba103420740edffcc9e8d050e3266d8106e03.tar.gz cnucnu-7cbba103420740edffcc9e8d050e3266d8106e03.tar.xz cnucnu-7cbba103420740edffcc9e8d050e3266d8106e03.zip |
Package: Support multiple groups in regex
Idea from Jaroslav Škarvada <jskarvad@redhat.com> in Red Hat bug report
759467 (https://bugzilla.redhat.com/show_bug.cgi?id=759467).
Diffstat (limited to 'cnucnu/package_list.py')
-rwxr-xr-x | cnucnu/package_list.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cnucnu/package_list.py b/cnucnu/package_list.py index e821fad..d5d6e88 100755 --- a/cnucnu/package_list.py +++ b/cnucnu/package_list.py @@ -269,7 +269,10 @@ class Package(object): upstream_versions = re.findall(self.regex, self.html) except sre_constants.error, e: raise cc_errors.UpstreamVersionRetrievalError("%s: invalid regular expression" % self.name) - for version in upstream_versions: + for index, version in enumerate(upstream_versions): + if type(version) == tuple: + version = ".".join([v for v in version if not v == ""]) + upstream_versions[index] = version if " " in version: raise cc_errors.UpstreamVersionRetrievalError("%s: invalid upstream version:>%s< - %s - %s " % (self.name, version, self.url, self.regex)) if len(upstream_versions) == 0: |