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

replace urlopen with requests.get

Browse source
This commit is contained in:
Tomas Kopecek 2021-10-13 15:08:50 +02:00
parent ba2e1e520b
commit 3ec6e87d5b
1 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

37
util/koji-shadow
View file

@ -25,6 +25,7 @@
from __future__ import absolute_import from __future__ import absolute_import
import fnmatch import fnmatch
from koji import request_with_retry
import optparse import optparse
import os import os
import random import random
@ -411,13 +412,15 @@ class TrackedBuild(object):
url = "%s/%s" % (pathinfo.build(self.info), pathinfo.rpm(self.srpm)) url = "%s/%s" % (pathinfo.build(self.info), pathinfo.rpm(self.srpm))
log("Downloading %s" % url) log("Downloading %s" % url)
# XXX - this is not really the right place for this # XXX - this is not really the right place for this
fsrc = urllib2.urlopen(url) # nosec resp = request_with_retry().get(url, stream=True)
fn = "%s/%s.src.rpm" % (options.workpath, self.nvr) fn = "%s/%s.src.rpm" % (options.workpath, self.nvr)
koji.ensuredir(os.path.dirname(fn)) koji.ensuredir(os.path.dirname(fn))
fdst = open(fn, 'wb') try:
shutil.copyfileobj(fsrc, fdst) with open(fn, 'wb') as fo:
fsrc.close() for chunk in resp.iter_content(chunk_size=8192):
fdst.close() fo.write(chunk)
finally:
resp.close()
serverdir = _unique_path('koji-shadow') serverdir = _unique_path('koji-shadow')
session.uploadWrapper(fn, serverdir, blocksize=65536) session.uploadWrapper(fn, serverdir, blocksize=65536)
src = "%s/%s" % (serverdir, os.path.basename(fn)) src = "%s/%s" % (serverdir, os.path.basename(fn))
@ -856,11 +859,13 @@ class BuildTracker(object):
koji.ensuredir(os.path.dirname(dst)) koji.ensuredir(os.path.dirname(dst))
os.chown(os.path.dirname(dst), 48, 48) # XXX - hack os.chown(os.path.dirname(dst), 48, 48) # XXX - hack
log("Downloading %s to %s" % (url, dst)) log("Downloading %s to %s" % (url, dst))
fsrc = urllib2.urlopen(url) # nosec resp = request_with_retry().get(url, stream=True)
fdst = open(fn, 'wb') try:
shutil.copyfileobj(fsrc, fdst) with open(fn, 'wb') as fo:
fsrc.close() for chunk in resp.iter_content(chunk_size=8192):
fdst.close() fo.write(chunk)
finally:
resp.close()
finally: finally:
os.umask(old_umask) os.umask(old_umask)
else: else:
@ -870,11 +875,13 @@ class BuildTracker(object):
koji.ensuredir(options.workpath) koji.ensuredir(options.workpath)
dst = "%s/%s" % (options.workpath, fn) dst = "%s/%s" % (options.workpath, fn)
log("Downloading %s to %s..." % (url, dst)) log("Downloading %s to %s..." % (url, dst))
fsrc = urllib2.urlopen(url) # nosec resp = request_with_retry().get(url, stream=True)
fdst = open(dst, 'wb') try:
shutil.copyfileobj(fsrc, fdst) with open(dst, 'wb') as fo:
fsrc.close() for chunk in resp.iter_content(chunk_size=8192):
fdst.close() fo.write(chunk)
finally:
resp.close()
log("Uploading %s..." % dst) log("Uploading %s..." % dst)
session.uploadWrapper(dst, serverdir, blocksize=65536) session.uploadWrapper(dst, serverdir, blocksize=65536)
session.importRPM(serverdir, fn) session.importRPM(serverdir, fn)