spack#11528 established 'spack-src' as the universal directory where …

…source files are placed. For resources, it is desirable to use the expanded archive name as the default; therefore this stores the expanded archive name and uses it as the default for 'placement'

lib/spack/spack/fetch_strategy.py

@@ -31,7 +31,7 @@
 from six import string_types, with_metaclass
 
 import llnl.util.tty as tty
-from llnl.util.filesystem import working_dir, mkdirp
+from llnl.util.filesystem import working_dir, mkdirp, join_path
 
 import spack.config
 import spack.error
@@ -371,6 +371,7 @@ def expand(self):
         if len(non_hidden) == 1:
             src = os.path.join(tarball_container, non_hidden[0])
             if os.path.isdir(src):
+                self.stage.srcdir = non_hidden[0]
                 shutil.move(src, self.stage.source_path)
                 if len(files) > 1:
                     files.remove(non_hidden[0])
@@ -385,7 +386,13 @@ def expand(self):
                 shutil.move(tarball_container, self.stage.source_path)
 
         else:
-            shutil.move(tarball_container, self.stage.source_path)
+            # TODO: note this is note specifically an issue with resources,
+            # but I think there was an issue with handling exploding tarballs
+            os.makedirs(self.stage.source_path)
+            for fname in non_hidden:
+                fpath = join_path(tarball_container, fname)
+                shutil.move(fpath, self.stage.source_path)
+            os.rmdir(tarball_container)
 
     def archive(self, destination):
         """Just moves this archive to the destination."""

lib/spack/spack/stage.py

@@ -182,6 +182,8 @@ def __init__(
         # used for mirrored archives of repositories.
         self.skip_checksum_for_mirror = True
 
+        self.srcdir = None
+
         # TODO : this uses a protected member of tempfile, but seemed the only
         # TODO : way to get a temporary name besides, the temporary link name
         # TODO : won't be the same as the temporary stage area in tmp_root
@@ -512,9 +514,14 @@ def _add_to_root_stage(self):
         """
         root_stage = self.root_stage
         resource = self.resource
-        placement = os.path.basename(self.source_path) \
-            if resource.placement is None \
-            else resource.placement
+
+        if resource.placement:
+            placement = resource.placement
+        elif self.srcdir:
+            placement = self.srcdir
+        else:
+            placement = self.source_path
+
         if not isinstance(placement, dict):
             placement = {'': placement}
 

var/spack/repos/builtin/packages/warpx/package.py

@@ -40,19 +40,16 @@ class Warpx(MakefilePackage):
     resource(name='amrex',
              git='https://github.com/AMReX-Codes/amrex.git',
              when='@master',
-             tag='master',
-             placement='amrex')
+             tag='master')
 
     resource(name='amrex',
              git='https://github.com/AMReX-Codes/amrex.git',
              when='@dev',
-             tag='development',
-             placement='amrex')
+             tag='development')
 
     resource(name='picsar',
              git='https://bitbucket.org/berkeleylab/picsar.git',
-             tag='master',
-             placement='picsar')
+             tag='master')
 
     @property
     def build_targets(self):