summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/cmd/mirror.py3
-rw-r--r--lib/spack/spack/url.py4
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/spack/spack/cmd/mirror.py b/lib/spack/spack/cmd/mirror.py
index 77cbb1eb58..ec91ef0fd5 100644
--- a/lib/spack/spack/cmd/mirror.py
+++ b/lib/spack/spack/cmd/mirror.py
@@ -23,6 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
import os
+import shutil
import argparse
import spack.packages as packages
@@ -78,7 +79,7 @@ def mirror(parser, args):
final_dst = new_path(pkg_path, basename)
os.chdir(working_dir)
- os.rename(stage.archive_file, final_dst)
+ shutil.move(stage.archive_file, final_dst)
tty.msg("Added %s to mirror" % final_dst)
finally:
diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py
index 0bc7ff53b4..a4c32eb37b 100644
--- a/lib/spack/spack/url.py
+++ b/lib/spack/spack/url.py
@@ -102,6 +102,9 @@ def parse_version_string_with_indices(path):
# e.g. https://github.com/petdance/ack/tarball/1.93_02
(r'github.com/.+/(?:zip|tar)ball/v?((\d+\.)+\d+_(\d+))$', path),
+ # e.g. https://github.com/hpc/lwgrp/archive/v1.0.1.tar.gz
+ (r'github.com/[^/]+/[^/]+/archive/v?(\d+(?:\.\d+)*)\.tar\.gz$', path),
+
# e.g. https://github.com/erlang/otp/tarball/OTP_R15B01 (erlang style)
(r'[-_](R\d+[AB]\d*(-\d+)?)', path),
@@ -169,6 +172,7 @@ def parse_name(path, ver=None):
ntypes = (r'/sourceforge/([^/]+)/',
r'/([^/]+)/(tarball|zipball)/',
r'/([^/]+)[_.-](bin|dist|stable|src|sources)[_.-]%s' % ver,
+ r'github.com/[^/]+/([^/]+)/archive',
r'/([^/]+)[_.-]v?%s' % ver,
r'/([^/]+)%s' % ver,
r'^([^/]+)[_.-]v?%s' % ver,