summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Maas <opensource@till.name>2014-01-30 18:31:58 +0100
committerTill Maas <opensource@till.name>2014-01-30 18:31:58 +0100
commitdfd3da4da5477ad64c16eb5564c3754af4df0f79 (patch)
tree6fb9936881447c4b361e580fe97eafad764db253
parent5557119463f6fa8dc9e8384b20781e8653e2a186 (diff)
downloadcnucnu-dfd3da4da5477ad64c16eb5564c3754af4df0f79.tar.gz
cnucnu-dfd3da4da5477ad64c16eb5564c3754af4df0f79.tar.xz
cnucnu-dfd3da4da5477ad64c16eb5564c3754af4df0f79.zip
package_list: Start to document default regex
-rwxr-xr-xcnucnu/package_list.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/cnucnu/package_list.py b/cnucnu/package_list.py
index 6f643cd..10f0845 100755
--- a/cnucnu/package_list.py
+++ b/cnucnu/package_list.py
@@ -188,15 +188,16 @@ class Package(object):
# strip "ghc-" prefix only if name was not overridden
if not name_override and name.startswith("ghc-"):
name = name[len("ghc-"):]
- regex = \
- r"\b%s[-_]" % re.escape(name) + \
- r"(?i)" + \
- r"(?:(?:src|source)[-_])?" + \
- r"([^-/_\s]*?" + \
- r"\d" + \
- r"[^-/_\s]*?)" + \
- r"(?:[-_.](?:src|source|orig))?" + \
- r"\.(?:[jt]ar|t[bglx]z|tbz2|zip)\b"
+ regex = (
+ r"(?i)" # ignore case
+ r"\b%(name)s[-_]" # word-boundary, name and dash/underscore
+ r"(?:(?:src|source)[-_])?" # optional src or source string
+ r"([^-/_\s]*?" #
+ r"\d"
+ r"[^-/_\s]*?)"
+ r"(?:[-_.](?:src|source|orig))?"
+ r"\.(?:[jt]ar|t[bglx]z|tbz2|zip)\b" % {'name': re.escape(name)}
+ )
elif regex == "FM-DEFAULT":
regex = '<a href="/projects/[^/]*/releases/[0-9]*">([^<]*)</a>'
elif regex == "DIR-LISTING-DEFAULT":