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

Buildcache cmd: add install -o/--otherarch option for installing macOS buildcaches on linux (#15192)

Browse Source 
* Buildcache command: add install option -o/--otherarch
This will allow matching specs from other archs, for example
installing macOS buildcaches on linux hosts.

* spack commands --update-completion
This commit is contained in:
Patrick Gartung 2020-02-25 11:01:59 -06:00 committed by GitHub
parent 8d8925c725
commit 676eb56ab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/spack/spack/cmd/buildcache.py
View File

@ -76,6 +76,10 @@ def setup_parser(subparser):
install.add_argument('-u', '--unsigned', action='store_true', install.add_argument('-u', '--unsigned', action='store_true',
help="install unsigned buildcache" + help="install unsigned buildcache" +
" tarballs for testing") " tarballs for testing")
install.add_argument('-o', '--otherarch', action='store_true',
help="install specs from other architectures" +
" instead of default platform and OS")
arguments.add_common_arguments(install, ['specs']) arguments.add_common_arguments(install, ['specs'])
install.set_defaults(func=installtarball) install.set_defaults(func=installtarball)
@ -252,7 +256,8 @@ def find_matching_specs(pkgs, allow_multiple_matches=False, env=None):
return specs_from_cli return specs_from_cli
def match_downloaded_specs(pkgs, allow_multiple_matches=False, force=False): def match_downloaded_specs(pkgs, allow_multiple_matches=False, force=False,
other_arch=False):
"""Returns a list of specs matching the not necessarily """Returns a list of specs matching the not necessarily
concretized specs given from cli concretized specs given from cli
@ -266,7 +271,7 @@ def match_downloaded_specs(pkgs, allow_multiple_matches=False, force=False):
# List of specs that match expressions given via command line # List of specs that match expressions given via command line
specs_from_cli = [] specs_from_cli = []
has_errors = False has_errors = False
allarch = False allarch = other_arch
specs = bindist.get_specs(force, allarch) specs = bindist.get_specs(force, allarch)
for pkg in pkgs: for pkg in pkgs:
matches = [] matches = []
@ -387,7 +392,8 @@ def installtarball(args):
tty.die("build cache file installation requires" + tty.die("build cache file installation requires" +
" at least one package spec argument") " at least one package spec argument")
pkgs = set(args.specs) pkgs = set(args.specs)
matches = match_downloaded_specs(pkgs, args.multiple, args.force) matches = match_downloaded_specs(pkgs, args.multiple, args.force,
args.otherarch)
for match in matches: for match in matches:
install_tarball(match, args) install_tarball(match, args)

2
share/spack/spack-completion.bash
View File

@ -391,7 +391,7 @@ _spack_buildcache_create() {
_spack_buildcache_install() { _spack_buildcache_install() {
if $list_options if $list_options
then then
SPACK_COMPREPLY="-h --help -f --force -m --multiple -a --allow-root -u --unsigned" SPACK_COMPREPLY="-h --help -f --force -m --multiple -a --allow-root -u --unsigned -o --otherarch"
else else
_all_packages _all_packages
fi fi