Ignore GPG/PGP signatures/checksums when finding available downloads (#2028)
* Ignore GPG/PGP signatures/checksums when finding available downloads * Remove duplicated basename
This commit is contained in:
parent
193f68083f
commit
d891143a08
2 changed files with 11 additions and 2 deletions
|
@ -323,7 +323,7 @@ def parse_name_and_version(path):
|
|||
|
||||
def insensitize(string):
|
||||
"""Change upper and lowercase letters to be case insensitive in
|
||||
the provided string. e.g., 'a' because '[Aa]', 'B' becomes
|
||||
the provided string. e.g., 'a' becomes '[Aa]', 'B' becomes
|
||||
'[bB]', etc. Use for building regexes."""
|
||||
def to_ins(match):
|
||||
char = match.group(1)
|
||||
|
|
|
@ -227,7 +227,16 @@ def find_versions_of_archive(*archive_urls, **kwargs):
|
|||
|
||||
# We'll be a bit more liberal and just look for the archive
|
||||
# part, not the full path.
|
||||
regexes.append(os.path.basename(url_regex))
|
||||
url_regex = os.path.basename(url_regex)
|
||||
|
||||
# We need to add a $ anchor to the end of the regex to prevent
|
||||
# Spack from picking up signature files like:
|
||||
# .asc
|
||||
# .md5
|
||||
# .sha256
|
||||
# .sig
|
||||
# However, SourceForge downloads still need to end in '/download'.
|
||||
regexes.append(url_regex + '(\/download)?$')
|
||||
|
||||
# Build a dict version -> URL from any links that match the wildcards.
|
||||
versions = {}
|
||||
|
|
Loading…
Reference in a new issue