Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file: Fix not checking sha1sum

Browse Source
This commit is contained in:
Bahadır Kandemir
2010-12-10 11:48:35 +00:00
parent 4c2de6d9a9
commit df68fc0f67
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/file.py
+6 -4
View File
@@ -126,11 +126,11 @@ class File:
#oldsha1fn = localfile + '.sha1sum' #oldsha1fn = localfile + '.sha1sum'
#if os.exists(oldsha1fn): #if os.exists(oldsha1fn):
#oldsha1 = file(oldsha1fn).readlines()[0] #oldsha1 = file(oldsha1fn).readlines()[0]
if sha1sum and os.path.exists(localfile): if sha1sum and os.path.exists(origfile):
oldsha1 = pisi.util.sha1_file(localfile) oldsha1 = pisi.util.sha1_file(origfile)
if (newsha1 == oldsha1): if (newsha1 == oldsha1):
# early terminate, we already got it ;) # early terminate, we already got it ;)
raise AlreadyHaveException(uri, localfile) raise AlreadyHaveException(uri, origfile)
if uri.is_remote_file(): if uri.is_remote_file():
ctx.ui.info(_("Fetching %s") % uri.get_uri(), verbose=True) ctx.ui.info(_("Fetching %s") % uri.get_uri(), verbose=True)
@@ -149,7 +149,9 @@ class File:
shutil.copy(oldfn, localfile) shutil.copy(oldfn, localfile)
def clean_temporary(): def clean_temporary():
temp_files = [sha1filename] temp_files = []
if sha1sum:
temp_files.append(sha1filename)
if check_integrity: if check_integrity:
temp_files.append(localfile) temp_files.append(localfile)
for filename in temp_files: for filename in temp_files: