Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 16:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

archive: change _download_file verify param to dscverify

Browse Source 
The param is specific to dsc-verifiable files, so name it accordingly.
This commit is contained in:
Dan Streetman 2020-01-22 14:32:56 -05:00
parent 53fa2336b8
commit d98e16226b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ubuntutools/archive.py
View File

@ -457,13 +457,12 @@ class SourcePackage(object):
(downloaded / 1024.0 / 1024, (downloaded / 1024.0 / 1024,
size / 1024.0 / 1024)) size / 1024.0 / 1024))
def _download_file(self, url, filename, verify=True, size=0): def _download_file(self, url, filename, dscverify=False, size=0):
"Download url to filename in workdir." "Download url to filename in workdir."
pathname = os.path.join(self.workdir, filename) pathname = os.path.join(self.workdir, filename)
if verify: if dscverify and self.dsc.verify_file(pathname):
if self.dsc.verify_file(pathname): Logger.debug('Using existing %s', filename)
Logger.debug('Using existing %s', filename) return True
return True
if urlparse(url).scheme in ["", "file"]: if urlparse(url).scheme in ["", "file"]:
frompath = os.path.abspath(urlparse(url).path) frompath = os.path.abspath(urlparse(url).path)
@ -494,7 +493,7 @@ class SourcePackage(object):
return False return False
raise e raise e
if verify and not self.dsc.verify_file(pathname): if dscverify and not self.dsc.verify_file(pathname):
Logger.error('Checksum for %s does not match.', filename) Logger.error('Checksum for %s does not match.', filename)
return False return False
return True return True
@ -506,7 +505,7 @@ class SourcePackage(object):
name = entry['name'] name = entry['name']
for url in self._source_urls(name): for url in self._source_urls(name):
try: try:
if self._download_file(url, name, size=int(entry['size'])): if self._download_file(url, name, dscverify=True, size=int(entry['size'])):
break break
except HTTPError as e: except HTTPError as e:
Logger.info('HTTP Error %i: %s', e.code, str(e)) Logger.info('HTTP Error %i: %s', e.code, str(e))