aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-01-09 18:45:05 +0000
committerMichael Büsch <mb@bu3sch.de>2010-01-09 18:45:05 +0000
commitbee5dab1a1ac8c2b2d2c12e86db5099a6c7d71c0 (patch)
treeb2d36e4208e0a9da1f7ec562b3a41fdd63ef732b
parent9c54343555214417eaac39e61951ff5a039c82d2 (diff)
downloadupstream-bee5dab1a1ac8c2b2d2c12e86db5099a6c7d71c0.tar.gz
upstream-bee5dab1a1ac8c2b2d2c12e86db5099a6c7d71c0.tar.bz2
upstream-bee5dab1a1ac8c2b2d2c12e86db5099a6c7d71c0.zip
dl_cleanup: Add regex for foo_1_2_3
SVN-Revision: 19084
-rwxr-xr-xscripts/dl_cleanup.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py
index ff38a158f0..7adc475d4d 100755
--- a/scripts/dl_cleanup.py
+++ b/scripts/dl_cleanup.py
@@ -27,7 +27,10 @@ def parseVer_1234(match):
def parseVer_123(match):
progname = match.group(1)
- patchlevel = match.group(5)
+ try:
+ patchlevel = match.group(5)
+ except (IndexError), e:
+ patchlevel = None
if patchlevel:
patchlevel = ord(patchlevel[0])
else:
@@ -40,7 +43,10 @@ def parseVer_123(match):
def parseVer_12(match):
progname = match.group(1)
- patchlevel = match.group(4)
+ try:
+ patchlevel = match.group(4)
+ except (IndexError), e:
+ patchlevel = None
if patchlevel:
patchlevel = ord(patchlevel[0])
else:
@@ -76,6 +82,7 @@ versionRegex = (
(re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)\.(\d+)"), parseVer_1234), # xxx-1.2.3.4
(re.compile(r"(.+)[-_](\d\d\d\d)-?(\d\d)-?(\d\d)"), parseVer_ymd), # xxx-YYYY-MM-DD
(re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)(\w?)"), parseVer_123), # xxx-1.2.3a
+ (re.compile(r"(.+)[-_](\d+)_(\d+)_(\d+)"), parseVer_123), # xxx-1_2_3
(re.compile(r"(.+)[-_](\d+)\.(\d+)(\w?)"), parseVer_12), # xxx-1.2a
(re.compile(r"(.+)[-_]r?(\d+)"), parseVer_r), # xxx-r1111
)
@@ -83,7 +90,6 @@ versionRegex = (
blacklist = [
("linux", re.compile(r"linux-.*")),
("gcc", re.compile(r"gcc-.*")),
- ("boost", re.compile(r"boost.*")),
("wl_apsta", re.compile(r"wl_apsta.*")),
(".fw", re.compile(r".*\.fw")),
(".arm", re.compile(r".*\.arm")),