particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR#2461: cli: delete downloaded file with zero size

Browse source 
Merges #2461
https://pagure.io/koji/pull-request/2461

Fixes: #2451
https://pagure.io/koji/issue/2451
koji download-build leaves around empty file when rpm not signed
This commit is contained in:
Tomas Kopecek 2020-09-07 10:12:59 +02:00
commit 20ada324b7
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
cli/koji_cli/lib.py
View file

@ -525,22 +525,27 @@ def download_file(url, relpath, quiet=False, noprogress=False, size=None,
# rewrite
f = open(relpath, 'wb')
# closing needs to be used for requests < 2.18.0
with closing(requests.get(url, headers=headers, stream=True)) as response:
if response.status_code in (200, 416): # full content provided or reaching behing EOF
# rewrite in such case
f.close()
f = open(relpath, 'wb')
response.raise_for_status()
length = filesize or int(response.headers.get('content-length') or 0)
for chunk in response.iter_content(chunk_size=1024**2):
pos += len(chunk)
f.write(chunk)
if not (quiet or noprogress):
_download_progress(length, pos, filesize)
if not length and not (quiet or noprogress):
_download_progress(pos, pos, filesize)
f.close()
try:
# closing needs to be used for requests < 2.18.0
with closing(requests.get(url, headers=headers, stream=True)) as response:
if response.status_code in (200, 416): # full content provided or reaching behind EOF
# rewrite in such case
f.close()
f = open(relpath, 'wb')
response.raise_for_status()
length = filesize or int(response.headers.get('content-length') or 0)
for chunk in response.iter_content(chunk_size=1024**2):
pos += len(chunk)
f.write(chunk)
if not (quiet or noprogress):
_download_progress(length, pos, filesize)
if not length and not (quiet or noprogress):
_download_progress(pos, pos, filesize)
finally:
f.close()
if pos == 0:
# nothing was downloaded, e.g file not found
os.unlink(relpath)
if not (quiet or noprogress):
print('')