summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiller86 <miller86@llnl.gov>2015-10-27 16:51:00 -0700
committermiller86 <miller86@llnl.gov>2015-10-27 17:05:27 -0700
commit21e9d5c5c3d9384e15339ac7cf03a5bf639f8e4d (patch)
tree227a24e940d64a16fcf55c037866dfbf824568dd
parentc1be1a362b1f689742fdcb4b39b961e17021a9e0 (diff)
downloadspack-21e9d5c5c3d9384e15339ac7cf03a5bf639f8e4d.tar.gz
spack-21e9d5c5c3d9384e15339ac7cf03a5bf639f8e4d.tar.bz2
spack-21e9d5c5c3d9384e15339ac7cf03a5bf639f8e4d.tar.xz
spack-21e9d5c5c3d9384e15339ac7cf03a5bf639f8e4d.zip
generalize one of the cases to handle many more kinds of formatting options
-rw-r--r--lib/spack/spack/url.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py
index 58838306af..6adbfe156d 100644
--- a/lib/spack/spack/url.py
+++ b/lib/spack/spack/url.py
@@ -209,8 +209,8 @@ def parse_version_offset(path):
# e.g. foobar-4.5.1
(r'-((\d+\.)*\d+)$', stem),
- # e.g. foobar-4.5.1b
- (r'-((\d+\.)*\d+\-?([a-z]|rc|RC|tp|TP)\d*)$', stem),
+ # e.g. foobar-4.5.1b, foobar4.5RC, foobar.v4.5.1b
+ (r'[-._]?v?((\d+\.)*\d+[-._]?([a-z]|rc|RC|tp|TP?)\d*)$', stem),
# e.g. foobar-4.5.0-beta1, or foobar-4.50-beta
(r'-((\d+\.)*\d+-beta(\d+)?)$', stem),