Bottomline : - fetcher change the current working directory - relative paths were resolved differently depending on the prder f evaluation
This commit is contained in:
parent
afd5d6b5cd
commit
c8bf8a5e6e
@ -25,6 +25,7 @@
|
|||||||
import argparse
|
import argparse
|
||||||
import hashlib
|
import hashlib
|
||||||
import os
|
import os
|
||||||
|
from urlparse import urlparse
|
||||||
|
|
||||||
import llnl.util.tty as tty
|
import llnl.util.tty as tty
|
||||||
import spack.util.crypto
|
import spack.util.crypto
|
||||||
@ -49,13 +50,23 @@ def compute_md5_checksum(url):
|
|||||||
return value
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
def normalized(files):
|
||||||
|
for p in files:
|
||||||
|
result = urlparse(p)
|
||||||
|
value = p
|
||||||
|
if not result.scheme:
|
||||||
|
value = os.path.abspath(p)
|
||||||
|
yield value
|
||||||
|
|
||||||
|
|
||||||
def md5(parser, args):
|
def md5(parser, args):
|
||||||
if not args.files:
|
if not args.files:
|
||||||
setup_parser.parser.print_help()
|
setup_parser.parser.print_help()
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
urls = [x for x in normalized(args.files)]
|
||||||
results = []
|
results = []
|
||||||
for url in args.files:
|
for url in urls:
|
||||||
try:
|
try:
|
||||||
checksum = compute_md5_checksum(url)
|
checksum = compute_md5_checksum(url)
|
||||||
results.append((checksum, url))
|
results.append((checksum, url))
|
||||||
@ -70,4 +81,4 @@ def md5(parser, args):
|
|||||||
checksum = 'checksum' if len(results) == 1 else 'checksums'
|
checksum = 'checksum' if len(results) == 1 else 'checksums'
|
||||||
tty.msg("%d MD5 %s:" % (len(results), checksum))
|
tty.msg("%d MD5 %s:" % (len(results), checksum))
|
||||||
for checksum, url in results:
|
for checksum, url in results:
|
||||||
print "%s %s" % (checksum, url)
|
print("{0} {1}".format(checksum, url))
|
||||||
|
Loading…
Reference in New Issue
Block a user