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

Fix mtime logic for py2.x

Browse source 
Related: https://pagure.io/koji/issue/3711
This commit is contained in:
Tomas Kopecek 2023-03-13 12:37:31 +01:00
parent e2d9511a81
commit 21dba45bfc
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cli/koji_cli/lib.py
View file

@ -591,6 +591,7 @@ def download_file(url, relpath, quiet=False, noprogress=False, size=None,
# rewrite
f = open(relpath, 'wb')
mtime = None
try:
# closing needs to be used for requests < 2.18.0
with closing(koji.request_with_retry().get(url, headers=headers, stream=True)) as response:
@ -615,12 +616,14 @@ def download_file(url, relpath, quiet=False, noprogress=False, size=None,
if mtime.tzinfo is None:
mtime = mtime.replace(tzinfo=dateutil.tz.gettz())
mtime = mtime.astimezone(dateutil.tz.gettz())
os.utime(relpath, (time.time(), time.mktime(mtime.timetuple())))
finally:
f.close()
if pos == 0:
# nothing was downloaded, e.g file not found
os.unlink(relpath)
elif mtime:
# mtime could be changed after close, otherwise py 2.x will update it.
os.utime(relpath, (time.time(), time.mktime(mtime.timetuple())))
if not (quiet or noprogress):
print('')