mirror of
https://github.com/openSUSE/osc.git
synced 2025-10-04 16:49:20 +02:00
bugfix for broken canonname
b'name'-b'version'-b'release'-b'arch'.rpm --> name-version-release-arch.rpm * switch shebang to #!/usr/bin/python3 for osc-wrapper.py * switch regex string to b''
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python3
|
||||
|
||||
# this wrapper exists so it can be put into /usr/bin, but still allows the
|
||||
# python module to be called within the source directory during development
|
||||
|
@@ -5,7 +5,7 @@
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
__version__ = '1.000'
|
||||
__version__ = '0.164.2'
|
||||
|
||||
# __store_version__ is to be incremented when the format of the working copy
|
||||
# "store" changes in an incompatible way. Please add any needed migration
|
||||
|
@@ -78,9 +78,9 @@ class Fetcher:
|
||||
raise oscerr.APIError('CPIO archive is incomplete '
|
||||
'(see .errors file)')
|
||||
if package == '_repository':
|
||||
n = re.sub(rb'\.pkg\.tar\..z$', b'.arch', hdr.filename)
|
||||
n = re.sub(b'\.pkg\.tar\..z$', b'.arch', hdr.filename)
|
||||
if n.startswith(b'container:'):
|
||||
n = re.sub(rb'\.tar\..z$', b'.tar', hdr.filename)
|
||||
n = re.sub(b'\.tar\..z$', b'.tar', hdr.filename)
|
||||
pac = pkgs[decode_it(n.rsplit(b'.', 1)[0])]
|
||||
pac.canonname = hdr.filename
|
||||
else:
|
||||
|
@@ -5,6 +5,7 @@ import os
|
||||
import re
|
||||
import struct
|
||||
from . import packagequery
|
||||
from osc.util.helper import decode_it
|
||||
|
||||
def cmp(a, b):
|
||||
return (a > b) - (a < b)
|
||||
@@ -291,7 +292,7 @@ class RpmQuery(packagequery.PackageQuery, packagequery.PackageQueryResult):
|
||||
arch = 'src'
|
||||
else:
|
||||
arch = self.arch()
|
||||
return RpmQuery.filename(self.name(), None, self.version(), self.release(), arch)
|
||||
return RpmQuery.filename(decode_it(self.name()), None, decode_it(self.version()), decode_it(self.release()), decode_it(arch))
|
||||
|
||||
@staticmethod
|
||||
def query(filename):
|
||||
|
Reference in New Issue
Block a user