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

buildcache.py: elide string not spec (#46074)

Browse Source
This commit is contained in:
Harmen Stoppels 2024-08-28 15:27:44 +02:00 committed by GitHub
parent fb4811ec3f
commit 85487f23bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/spack/llnl/util/lang.py
View File

@ -843,20 +843,19 @@ def uniq(sequence):
return uniq_list return uniq_list
def elide_list(line_list, max_num=10): def elide_list(line_list: List[str], max_num: int = 10) -> List[str]:
"""Takes a long list and limits it to a smaller number of elements, """Takes a long list and limits it to a smaller number of elements,
replacing intervening elements with '...'. For example:: replacing intervening elements with '...'. For example::
elide_list([1,2,3,4,5,6], 4) elide_list(["1", "2", "3", "4", "5", "6"], 4)
gives:: gives::
[1, 2, 3, '...', 6] ["1", "2", "3", "...", "6"]
""" """
if len(line_list) > max_num: if len(line_list) > max_num:
return line_list[: max_num - 1] + ["..."] + line_list[-1:] return [*line_list[: max_num - 1], "...", line_list[-1]]
else: return line_list
return line_list
@contextlib.contextmanager @contextlib.contextmanager

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

@ -460,7 +460,7 @@ def push_fn(args):
"The following {} specs were skipped as they already exist in the buildcache:\n" "The following {} specs were skipped as they already exist in the buildcache:\n"
" {}\n" " {}\n"
" Use --force to overwrite them.".format( " Use --force to overwrite them.".format(
len(skipped), ", ".join(elide_list(skipped, 5)) len(skipped), ", ".join(elide_list([_format_spec(s) for s in skipped], 5))
) )
) )