Fix SHA1 package verification under Cygwin Env. Resolve #26

This commit is contained in:
Ivan Kravets
2014-11-21 18:13:02 +02:00
parent 32230c6b60
commit 7f918da87d

View File

@ -67,17 +67,17 @@ class FileDownloader(object):
dlsha1 = None
try:
res = check_output(["sha1sum", self._destination])
dlsha1 = res[:40]
dlsha1 = check_output(["sha1sum", self._destination])
except OSError:
try:
res = check_output(["shasum", "-a", "1", self._destination])
dlsha1 = res[:40]
dlsha1 = check_output(["shasum", "-a", "1", self._destination])
except OSError:
pass
if dlsha1 and sha1 != dlsha1:
raise FDSHASumMismatch(dlsha1, self._fname, sha1)
if dlsha1:
dlsha1 = dlsha1[1:41] if dlsha1.startswith("\\") else dlsha1[:40]
if sha1 != dlsha1:
raise FDSHASumMismatch(dlsha1, self._fname, sha1)
def _preserve_filemtime(self, lmdate):
timedata = parsedate_tz(lmdate)