mirror of
https://github.com/openSUSE/osc.git
synced 2025-08-06 15:43:39 +02:00
Return bytes in packagequery.PackageQueryResult.evr() instead of a str
The packagequery.PackageQueryResult class is supposed to provide a bytes API. Hence, packagequery.PackageQueryResult.evr() should return bytes instead of a str. Also, adjust the single caller in the build module.
This commit is contained in:
@@ -480,7 +480,7 @@ def create_deps(pkgqs):
|
||||
d = p.supplements()
|
||||
if d:
|
||||
depfile.append(b's:%s%s' % (id, b' '.join(d)))
|
||||
depfile.append(b'I:%s%s-%s 0-%s' % (id, p.name(), p.evr().encode(), p.arch()))
|
||||
depfile.append(b'I:%s%s-%s 0-%s' % (id, p.name(), p.evr(), p.arch()))
|
||||
return depfile
|
||||
|
||||
|
||||
|
@@ -151,14 +151,14 @@ class PackageQueryResult:
|
||||
raise NotImplementedError
|
||||
|
||||
def evr(self):
|
||||
evr = decode_it(self.version())
|
||||
evr = self.version()
|
||||
|
||||
if self.release():
|
||||
evr += "-" + decode_it(self.release())
|
||||
evr += b"-" + self.release()
|
||||
|
||||
epoch = self.epoch()
|
||||
if epoch is not None and epoch != 0:
|
||||
evr = epoch + ":" + evr
|
||||
evr = epoch + b":" + evr
|
||||
return evr
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user