zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://cz-stash.llnl.gov:7999/scale/spack into develop

Browse Source
This commit is contained in:
Gregory L. Lee 2015-06-03 14:22:10 -07:00
commit c158012655
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/spack/spack/cmd/location.py
View File

@ -54,6 +54,8 @@ def setup_parser(subparser):
help="Top-level packages directory for Spack.") help="Top-level packages directory for Spack.")
directories.add_argument( directories.add_argument(
'-s', '--stage-dir', action='store_true', help="Stage directory for a spec.") '-s', '--stage-dir', action='store_true', help="Stage directory for a spec.")
directories.add_argument(
'-S', '--stages', action='store_true', help="Top level Stage directory.")
directories.add_argument( directories.add_argument(
'-b', '--build-dir', action='store_true', '-b', '--build-dir', action='store_true',
help="Checked out or expanded source directory for a spec (requires it to be staged first).") help="Checked out or expanded source directory for a spec (requires it to be staged first).")
@ -72,6 +74,9 @@ def location(parser, args):
elif args.packages: elif args.packages:
print spack.db.root print spack.db.root
elif args.stages:
print spack.stage_path
else: else:
specs = spack.cmd.parse_specs(args.spec) specs = spack.cmd.parse_specs(args.spec)
if not specs: if not specs:

19
lib/spack/spack/fetch_strategy.py
View File

@ -220,13 +220,22 @@ def expand(self):
os.chdir(tarball_container) os.chdir(tarball_container)
decompress(self.archive_file) decompress(self.archive_file)
# If the tarball *didn't* explode, move # Check for an exploding tarball, i.e. one that doesn't expand
# the expanded directory up & remove the protector directory. # to a single directory. If the tarball *didn't* explode,
# move contents up & remove the container directory.
#
# NOTE: The tar program on Mac OS X will encode HFS metadata
# in hidden files, which can end up *alongside* a single
# top-level directory. We ignore hidden files to accomodate
# these "semi-exploding" tarballs.
files = os.listdir(tarball_container) files = os.listdir(tarball_container)
if len(files) == 1: non_hidden = filter(lambda f: not f.startswith('.'), files)
expanded_dir = os.path.join(tarball_container, files[0]) if len(non_hidden) == 1:
expanded_dir = os.path.join(tarball_container, non_hidden[0])
if os.path.isdir(expanded_dir): if os.path.isdir(expanded_dir):
shutil.move(expanded_dir, self.stage.path) for f in files:
shutil.move(os.path.join(tarball_container, f),
os.path.join(self.stage.path, f))
os.rmdir(tarball_container) os.rmdir(tarball_container)
# Set the wd back to the stage when done. # Set the wd back to the stage when done.