Merge branch 'releases/v0.12'

This reverts commit 058cf81312.

.travis.yml

@@ -27,7 +27,12 @@ jobs:
       os: linux
       language: python
       env: TEST_SUITE=flake8
-    - stage: 'unit tests + documentation'
+    - stage: 'flake8 + documentation'
+      python: '2.7'
+      os: linux
+      language: python
+      env: TEST_SUITE=doc
+    - stage: 'unit tests'
       python: '2.6'
       sudo: required
       os: linux
@@ -127,6 +132,14 @@ stages:
     if: type = push AND branch IN (develop, master)
 
 
+stages:
+  - 'flake8 + documentation'
+  - 'unit tests'
+  - 'build tests'
+  - name: 'unit tests - osx'
+    if: type IN (cron)
+
+
 #=============================================================================
 # Environment
 #=============================================================================

lib/spack/docs/packaging_guide.rst

@@ -2692,7 +2692,8 @@ as arguments.
 
 Here are the definitions of the three built-in flag handlers:
 
-.. code-block:: python
+   def build_system_flags(self, name, flags):
+       return (None, None, flags)
 
    def inject_flags(pkg, name, flags):
        return (flags, None, None)

lib/spack/spack/binary_distribution.py

@@ -269,9 +269,7 @@ def build_tarball(spec, outdir, force=False, rel=False, unsigned=False,
             raise NoOverwriteException(str(specfile_path))
     # make a copy of the install directory to work with
     workdir = os.path.join(tempfile.mkdtemp(), os.path.basename(spec.prefix))
-    # set symlinks=False here to avoid broken symlinks when archiving and
-    # moving the package
-    install_tree(spec.prefix, workdir, symlinks=False)
+    install_tree(spec.prefix, workdir, symlinks=True)
 
     # create info for later relocation and create tar
     write_buildinfo_file(spec.prefix, workdir, rel=rel)
@@ -398,8 +396,6 @@ def relocate_package(workdir, allow_root):
     new_path = spack.store.layout.root
     old_path = buildinfo['buildpath']
     rel = buildinfo.get('relative_rpaths', False)
-    if rel:
-        return
 
     tty.msg("Relocating package from",
             "%s to %s." % (old_path, new_path))
@@ -589,14 +585,14 @@ def get_keys(install=False, trust=False, force=False):
             tty.msg("Finding public keys in %s" % mirror)
             files = os.listdir(mirror)
             for file in files:
-                if re.search(r'\.key', file):
+                if re.search('\.key', file):
                     link = 'file://' + mirror + '/' + file
                     keys.add(link)
         else:
             tty.msg("Finding public keys on %s" % url)
             p, links = spider(url + "/build_cache", depth=1)
             for link in links:
-                if re.search(r'\.key', link):
+                if re.search("\.key", link):
                     keys.add(link)
         for link in keys:
             with Stage(link, name="build_cache", keep=True) as stage:

lib/spack/spack/modules/common.py

@@ -487,7 +487,7 @@ def configure_options(self):
             try:
                 configure_args = getattr(pkg, attr)()
                 return ' '.join(configure_args)
-            except (AttributeError, IOError, KeyError):
+            except (AttributeError, IOError, KeyError, NameError):
                 # The method doesn't exist in the current spec,
                 # or it's not usable
                 pass