From 2db83a6c2ad1685a3d44caf435e702c5991732d1 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Sun, 6 Sep 2009 17:02:55 +0300 Subject: Improve cnucnu DEFAULT regex This default regex catches more tarball types, avoids some false positives and accepts underscore as the separator between name and version. --- cnucnu/package_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cnucnu/package_list.py') diff --git a/cnucnu/package_list.py b/cnucnu/package_list.py index 61f2ea9..8276817 100644 --- a/cnucnu/package_list.py +++ b/cnucnu/package_list.py @@ -115,7 +115,7 @@ class Package(object): def set_regex(self, regex): if regex == "DEFAULT": - regex = "%s-([0-9.]*)\\.[tz][ai][rp]" % re.escape(self.name) + regex = r"\b%s[-_]([^-_\s]+?)\.(?:tar|t[bglx]z|tbz2|zip)\b" % re.escape(self.name) elif regex == "FM-DEFAULT": regex = '([^<]*)' self.__regex = regex -- cgit