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

spack deprecate: deprecate --link-type flag (#46202)

Browse Source
This commit is contained in:
Harmen Stoppels 2024-09-05 11:06:46 +02:00 committed by GitHub
parent 1a4b07e730
commit 2107a88514
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/spack/spack/cmd/deprecate.py
View File

@ -14,7 +14,6 @@
installation and its deprecator. installation and its deprecator.
""" """
import argparse import argparse
import os
import llnl.util.tty as tty import llnl.util.tty as tty
from llnl.util.symlink import symlink from llnl.util.symlink import symlink
@ -76,12 +75,7 @@ def setup_parser(sp):
) )
sp.add_argument( sp.add_argument(
"-l", "-l", "--link-type", type=str, default=None, choices=["soft", "hard"], help="(deprecated)"
"--link-type",
type=str,
default="soft",
choices=["soft", "hard"],
help="type of filesystem link to use for deprecation (default soft)",
) )
sp.add_argument( sp.add_argument(
@ -91,6 +85,9 @@ def setup_parser(sp):
def deprecate(parser, args): def deprecate(parser, args):
"""Deprecate one spec in favor of another""" """Deprecate one spec in favor of another"""
if args.link_type is not None:
tty.warn("The --link-type option is deprecated and will be removed in a future release.")
env = ev.active_environment() env = ev.active_environment()
specs = spack.cmd.parse_specs(args.specs) specs = spack.cmd.parse_specs(args.specs)
@ -144,7 +141,5 @@ def deprecate(parser, args):
if not answer: if not answer:
tty.die("Will not deprecate any packages.") tty.die("Will not deprecate any packages.")
link_fn = os.link if args.link_type == "hard" else symlink
for dcate, dcator in zip(all_deprecate, all_deprecators): for dcate, dcator in zip(all_deprecate, all_deprecators):
dcate.package.do_deprecate(dcator, link_fn) dcate.package.do_deprecate(dcator, symlink)

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

@ -1373,7 +1373,7 @@ complete -c spack -n '__fish_spack_using_command deprecate' -s i -l install-depr
complete -c spack -n '__fish_spack_using_command deprecate' -s I -l no-install-deprecator -f -a install complete -c spack -n '__fish_spack_using_command deprecate' -s I -l no-install-deprecator -f -a install
complete -c spack -n '__fish_spack_using_command deprecate' -s I -l no-install-deprecator -d 'deprecator spec must already be installed (default)' complete -c spack -n '__fish_spack_using_command deprecate' -s I -l no-install-deprecator -d 'deprecator spec must already be installed (default)'
complete -c spack -n '__fish_spack_using_command deprecate' -s l -l link-type -r -f -a 'soft hard' complete -c spack -n '__fish_spack_using_command deprecate' -s l -l link-type -r -f -a 'soft hard'
complete -c spack -n '__fish_spack_using_command deprecate' -s l -l link-type -r -d 'type of filesystem link to use for deprecation (default soft)' complete -c spack -n '__fish_spack_using_command deprecate' -s l -l link-type -r -d (deprecated)
# spack dev-build # spack dev-build
set -g __fish_spack_optspecs_spack_dev_build h/help j/jobs= n/no-checksum d/source-path= i/ignore-dependencies keep-prefix skip-patch q/quiet drop-in= test= b/before= u/until= clean dirty U/fresh reuse fresh-roots deprecated set -g __fish_spack_optspecs_spack_dev_build h/help j/jobs= n/no-checksum d/source-path= i/ignore-dependencies keep-prefix skip-patch q/quiet drop-in= test= b/before= u/until= clean dirty U/fresh reuse fresh-roots deprecated