mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-09-20 09:16:16 +02:00
Code

fix and unify building of local package cache

Browse Source 
* all filename functions now return bytes-like objects
* the caller does the decoding
* the caller in build.py passes encoded arguments
This commit is contained in:
lethliel 2019-07-26 10:45:12 +02:00
parent 5e39cdf683
commit 2aa6e998d2
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osc/build.py
View File

@ -229,18 +229,28 @@ class Pac:
self.mp['apiurl'] = apiurl self.mp['apiurl'] = apiurl
if self.mp['epoch'] is None:
epoch = None
else:
epoch = self.mp['epoch'].encode()
if self.mp['release'] is None:
release = None
else:
release = self.mp['release'].encode()
if self.mp['name'].startswith('container:'): if self.mp['name'].startswith('container:'):
canonname = self.mp['name'] + '.tar.xz' canonname = self.mp['name'] + '.tar.xz'
elif pacsuffix == 'deb': elif pacsuffix == 'deb':
canonname = debquery.DebQuery.filename(self.mp['name'], self.mp['epoch'], self.mp['version'], self.mp['release'], self.mp['arch']) canonname = debquery.DebQuery.filename(self.mp['name'].encode(), epoch, self.mp['version'].encode(), release, self.mp['arch'].encode())
elif pacsuffix == 'arch': elif pacsuffix == 'arch':
canonname = archquery.ArchQuery.filename(self.mp['name'], self.mp['epoch'], self.mp['version'], self.mp['release'], self.mp['arch']) canonname = archquery.ArchQuery.filename(self.mp['name'].encode(), epoch, self.mp['version'].encode(), release, self.mp['arch'].encode())
else: else:
canonname = rpmquery.RpmQuery.filename(self.mp['name'], self.mp['epoch'], self.mp['version'], self.mp['release'], self.mp['arch']) canonname = rpmquery.RpmQuery.filename(self.mp['name'].encode(), epoch, self.mp['version'].encode(), release, self.mp['arch'].encode())
self.mp['canonname'] = canonname self.mp['canonname'] = decode_it(canonname)
# maybe we should rename filename key to binary # maybe we should rename filename key to binary
self.mp['filename'] = node.get('binary') or canonname self.mp['filename'] = node.get('binary') or decode_it(canonname)
if self.mp['repopackage'] == '_repository': if self.mp['repopackage'] == '_repository':
self.mp['repofilename'] = self.mp['name'] self.mp['repofilename'] = self.mp['name']
else: else:

4
osc/util/debquery.py
View File

@ -229,9 +229,9 @@ class DebQuery(packagequery.PackageQuery, packagequery.PackageQueryResult):
@staticmethod @staticmethod
def filename(name, epoch, version, release, arch): def filename(name, epoch, version, release, arch):
if release: if release:
return '%s_%s-%s_%s.deb' % (name, version, release, arch) return b'%s_%s-%s_%s.deb' % (name, version, release, arch)
else: else:
return '%s_%s_%s.deb' % (name, version, arch) return b'%s_%s_%s.deb' % (name, version, arch)
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys

8
osc/util/repodata.py
View File

@ -169,8 +169,12 @@ class RepoDataQueryResult(osc.util.packagequery.PackageQueryResult):
return self.__parseEntryCollection('enhances') return self.__parseEntryCollection('enhances')
def canonname(self): def canonname(self):
return osc.util.rpmquery.RpmQuery.filename(self.name(), None, if self.release() is None:
self.version(), self.release(), self.arch()) release = None
else:
release = self.release().encode()
return osc.util.rpmquery.RpmQuery.filename(self.name().encode(), None,
self.version().encode(), release, self.arch().encode())
def gettag(self, tag): def gettag(self, tag):
# implement me, if needed # implement me, if needed

8
osc/util/rpmquery.py
View File

@ -287,12 +287,12 @@ class RpmQuery(packagequery.PackageQuery, packagequery.PackageQueryResult):
def canonname(self): def canonname(self):
if self.is_nosrc(): if self.is_nosrc():
arch = 'nosrc' arch = b'nosrc'
elif self.is_src(): elif self.is_src():
arch = 'src' arch = b'src'
else: else:
arch = self.arch() arch = self.arch()
return RpmQuery.filename(decode_it(self.name()), None, decode_it(self.version()), decode_it(self.release()), decode_it(arch)) return RpmQuery.filename(self.name(), None, self.version(), self.release(), arch)
@staticmethod @staticmethod
def query(filename): def query(filename):
@ -374,7 +374,7 @@ class RpmQuery(packagequery.PackageQuery, packagequery.PackageQueryResult):
@staticmethod @staticmethod
def filename(name, epoch, version, release, arch): def filename(name, epoch, version, release, arch):
return '%s-%s-%s.%s.rpm' % (name, version, release, arch) return b'%s-%s-%s.%s.rpm' % (name, version, release, arch)
def unpack_string(data, encoding=None): def unpack_string(data, encoding=None):
"""unpack a '\\0' terminated string from data""" """unpack a '\\0' terminated string from data"""