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

add dependency fetching to mirror creation

Browse Source
This commit is contained in:
Tom Scogland 2015-12-10 08:32:51 -08:00
parent 25f2b01a3c
commit 786f4cd2c2
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/cmd/fetch.py
View File

@ -36,7 +36,7 @@ def setup_parser(subparser):
subparser.add_argument( subparser.add_argument(
'-m', '--missing', action='store_true', help="Also fetch all missing dependencies") '-m', '--missing', action='store_true', help="Also fetch all missing dependencies")
subparser.add_argument( subparser.add_argument(
'-d', '--dependencies', action='store_true', help="Also fetch all dependencies") '-D', '--dependencies', action='store_true', help="Also fetch all dependencies")
subparser.add_argument( subparser.add_argument(
'packages', nargs=argparse.REMAINDER, help="specs of packages to fetch") 'packages', nargs=argparse.REMAINDER, help="specs of packages to fetch")

11
lib/spack/spack/cmd/mirror.py
View File

@ -54,6 +54,8 @@ def setup_parser(subparser):
'specs', nargs=argparse.REMAINDER, help="Specs of packages to put in mirror") 'specs', nargs=argparse.REMAINDER, help="Specs of packages to put in mirror")
create_parser.add_argument( create_parser.add_argument(
'-f', '--file', help="File with specs of packages to put in mirror.") '-f', '--file', help="File with specs of packages to put in mirror.")
create_parser.add_argument(
'-D', '--dependencies', action='store_true', help="Also fetch all dependencies")
create_parser.add_argument( create_parser.add_argument(
'-o', '--one-version-per-spec', action='store_const', const=1, default=0, '-o', '--one-version-per-spec', action='store_const', const=1, default=0,
help="Only fetch one 'preferred' version per spec, not all known versions.") help="Only fetch one 'preferred' version per spec, not all known versions.")
@ -118,7 +120,7 @@ def mirror_create(args):
"""Create a directory to be used as a spack mirror, and fill it with """Create a directory to be used as a spack mirror, and fill it with
package archives.""" package archives."""
# try to parse specs from the command line first. # try to parse specs from the command line first.
specs = spack.cmd.parse_specs(args.specs) specs = spack.cmd.parse_specs(args.specs, concretize=True)
# If there is a file, parse each line as a spec and add it to the list. # If there is a file, parse each line as a spec and add it to the list.
if args.file: if args.file:
@ -131,6 +133,13 @@ def mirror_create(args):
specs = [Spec(n) for n in spack.db.all_package_names()] specs = [Spec(n) for n in spack.db.all_package_names()]
specs.sort(key=lambda s: s.format("$_$@").lower()) specs.sort(key=lambda s: s.format("$_$@").lower())
if args.dependencies:
new_specs = set()
for spec in specs:
for s in spec.traverse():
new_specs.add(s)
specs = list(new_specs)
# Default name for directory is spack-mirror-<DATESTAMP> # Default name for directory is spack-mirror-<DATESTAMP>
directory = args.directory directory = args.directory
if not directory: if not directory:

2
var/spack/packages/py-cffi/package.py
View File

@ -4,7 +4,7 @@ class PyCffi(Package):
"""Foreign Function Interface for Python calling C code""" """Foreign Function Interface for Python calling C code"""
homepage = "http://cffi.readthedocs.org/en/latest/" homepage = "http://cffi.readthedocs.org/en/latest/"
# base https://pypi.python.org/pypi/cffi # base https://pypi.python.org/pypi/cffi
url = "https://pypi.python.org/packages/source/c/cffi/cffi-1.1.2.tar.gz#md5=" url = "https://pypi.python.org/packages/source/c/cffi/cffi-1.1.2.tar.gz"
version('1.1.2', 'ca6e6c45b45caa87aee9adc7c796eaea') version('1.1.2', 'ca6e6c45b45caa87aee9adc7c796eaea')