diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-10-29 00:02:01 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-10-29 00:02:01 -0700 |
| commit | ed0c80e1cb866f5c7a242b8d924dfe8233bda43a (patch) | |
| tree | e914d04330b6d11d1c93e23e42dd393468279abd /lib | |
| parent | fec6674597dfc4c48b489b484e281582c5b881fb (diff) | |
| parent | 21e9d5c5c3d9384e15339ac7cf03a5bf639f8e4d (diff) | |
| download | spack-ed0c80e1cb866f5c7a242b8d924dfe8233bda43a.tar.gz spack-ed0c80e1cb866f5c7a242b8d924dfe8233bda43a.tar.bz2 spack-ed0c80e1cb866f5c7a242b8d924dfe8233bda43a.tar.xz spack-ed0c80e1cb866f5c7a242b8d924dfe8233bda43a.zip | |
Merge pull request #145 from markcmiller86/v-char-bugfix
generalize one of the cases to handle many more kinds of formatting o…
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/url.py | 4 |
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), |