Merge branch 'master' of https://lc.llnl.gov/stash/scm/scale/spack

3 files changed, 12 insertions, 5 deletions

diff --git a/lib/spack/spack/tty.py b/lib/spack/spack/tty.py
index df4760df40..b9ad3f12bf 100644
--- a/lib/spack/spack/tty.py
+++ b/lib/spack/spack/tty.py
@@ -36,27 +36,27 @@ def msg(message, *args):
 
 def info(message, *args, **kwargs):
     format = kwargs.get('format', '*b')
-    cprint("@%s{==>} %s" % (format, cescape(message)))
+    cprint("@%s{==>} %s" % (format, cescape(str(message))))
     for arg in args:
         print indent + str(arg)
 
 
 def verbose(message, *args):
     if spack.verbose:
-        info(message, *args, format='c')
+        info(str(message), *args, format='c')
 
 
 def debug(*args):
     if spack.debug:
-        info("Debug: " + message, *args, format='*g')
+        info("Debug: " + str(message), *args, format='*g')
 
 
 def error(message, *args):
-    info("Error: " + message, *args, format='*r')
+    info("Error: " + str(message), *args, format='*r')
 
 
 def warn(message, *args):
-    info("Warning: " + message, *args, format='*Y')
+    info("Warning: " + str(message), *args, format='*Y')
 
 
 def die(message, *args):
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,
diff --git a/lib/spack/spack/util/compression.py b/lib/spack/spack/util/compression.py
index ca98160bdd..2b8b05eb28 100644
--- a/lib/spack/spack/util/compression.py
+++ b/lib/spack/spack/util/compression.py
@@ -39,6 +39,9 @@ def allowed_archive(path):
 
 def decompressor_for(path):
     """Get the appropriate decompressor for a path."""
+    if path.endswith(".zip"):
+        unzip = which('unzip', required=True)
+        return unzip
     tar = which('tar', required=True)
     tar.add_default_arg('-xf')
     return tar