Retain version string in downloaded package names
This commit is contained in:
parent
57db520dbb
commit
65f5bc18c0
@ -77,10 +77,11 @@ class PkgMgr:
|
||||
|
||||
def download_package(self, name, item):
|
||||
# Download tar.xz package and verify its hash. Can raise InvalidSignature
|
||||
tmp_archive = '/tmp/{}.tar.xz'.format(name)
|
||||
r = self.get_repo_resource('{}.tar.xz'.format(name), True)
|
||||
pkg_filename = '{}_{}-{}.tar.xz'.format(name, self.online_packages[name]['version'], self.online_packages[name]['release'])
|
||||
res = self.get_repo_resource(pkg_filename, True)
|
||||
tmp_archive = os.path.join('/tmp', pkg_filename)
|
||||
with open(tmp_archive, 'wb') as f:
|
||||
for chunk in r.iter_content(chunk_size=65536):
|
||||
for chunk in res.iter_content(chunk_size=65536):
|
||||
if chunk:
|
||||
item.bytes_downloaded += f.write(chunk)
|
||||
# Verify hash
|
||||
@ -88,7 +89,8 @@ class PkgMgr:
|
||||
|
||||
def unpack_package(self, name):
|
||||
# Unpack archive
|
||||
tmp_archive = '/tmp/{}.tar.xz'.format(name)
|
||||
pkg_filename = '{}_{}-{}.tar.xz'.format(name, self.online_packages[name]['version'], self.online_packages[name]['release'])
|
||||
tmp_archive = os.path.join('/tmp', pkg_filename)
|
||||
subprocess.run(['tar', 'xJf', tmp_archive], cwd='/', check=True)
|
||||
os.unlink(tmp_archive)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user