diff options
| -rwxr-xr-x | mgagnome | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -547,7 +547,7 @@ class SpecFile(object): if (flag & rpm.RPMSENSE_GREATER): ver_cmp += '>' if (flag & rpm.RPMSENSE_EQUAL): ver_cmp += '=' - br[req] = (ver_cmp, ver) + br[req.decode('utf-8')] = (ver_cmp, ver) return br @property @@ -718,7 +718,7 @@ class SpecFile(object): made_changes = True self._changes['SILENT %s' % change_description] = True elif len(changes) != 0: - print("ERROR: Could not update buildrequires!", file=sys.stderr) + print("ERROR: Could not update buildrequires for %s" % self.module, file=sys.stderr) print(changes) return False @@ -1404,18 +1404,18 @@ def cmd_clean_spec_multi(args): convert_brs = { 'pkgconfig': { 'desc': 'convert -devel buildrequires into pkgconfig', - 'check_br': lambda req: req.endswith(b'-devel'), + 'check_br': lambda req: req.endswith('-devel'), 'check_provide': lambda prov: prov.startswith('pkgconfig('), 'basereq': lambda req: req[:-len('-devel')], 'extra': lambda basereq: [ 'pkgconfig(%s)' % basereq, - 'pkgconfig(%s)' % basereq[len('lib'):] if basereq.startswith(b'lib') else 'pkgconfig(lib%s)' % basereq + 'pkgconfig(%s)' % basereq[len('lib'):] if basereq.startswith('lib') else 'pkgconfig(lib%s)' % basereq ], }, 'perl': { 'desc': 'convert perl- buildrequires into perl()', - 'check_br': lambda req: req.startswith(b'perl-'), - 'check_provide': lambda prov: prov.startswith(b'perl('), + 'check_br': lambda req: req.startswith('perl-'), + 'check_provide': lambda prov: prov.startswith('perl('), 'basereq': lambda req: req[len('perl-'):], 'extra': lambda basereq: ['perl(%s)' % basereq.replace('-', '::')], } |