From 04af1ae1c609c0b73afabaf2aeb58110043847e6 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Wed, 3 Feb 2016 13:16:27 -0500 Subject: [PATCH] Always use the python hashlib for verifying the virtualenv download in common_startup.sh rather than attempting to use sha256sum. Older versions of coreutils (such as in RHEL 6) did not include the --strict argument to sha256sum. --- scripts/common_startup.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh index f1f1cba1ef7..405cbfedb09 100755 --- a/scripts/common_startup.sh +++ b/scripts/common_startup.sh @@ -101,11 +101,7 @@ if [ $SET_VENV -eq 1 -a $CREATE_VENV -eq 1 ]; then python -c "import urllib; urllib.urlretrieve('$vurl', '$vsrc')" fi echo "Verifying $vsrc checksum is $vsha" - if command -v sha256sum >/dev/null; then - echo "$vsha $vsrc" | sha256sum -c --strict - else - python -c "import hashlib; assert hashlib.sha256(open('$vsrc', 'rb').read()).hexdigest() == '$vsha', '$vsrc: invalid checksum'" - fi + python -c "import hashlib; assert hashlib.sha256(open('$vsrc', 'rb').read()).hexdigest() == '$vsha', '$vsrc: invalid checksum'" tar zxf $vsrc -C $vtmp python $vtmp/virtualenv-$vvers/virtualenv.py "$GALAXY_VIRTUAL_ENV" rm -rf $vtmp