From 36fd9533dba9fecad442835588ea97a61b125016 Mon Sep 17 00:00:00 2001 From: Miro HronĨok Date: Mar 14 2019 14:19:34 +0000 Subject: Fix packages with no main %files section --- diff --git a/src/FedoraReview/spec_file.py b/src/FedoraReview/spec_file.py index 059b789..3fef443 100644 --- a/src/FedoraReview/spec_file.py +++ b/src/FedoraReview/spec_file.py @@ -187,9 +187,9 @@ class SpecFile(object): elif token == '-f': tokens.pop(0) else: - return self.base_package + '-' + token + return self.base_package.decode() + '-' + token - return self.base_package + return self.base_package.decode() def _parse_files(self, pkg_name): ''' Parse and return the %files section for pkg_name. @@ -219,7 +219,7 @@ class SpecFile(object): lines.append(line) elif line: lines.append(line) - return [l.decode('utf-8') for l in lines] + return lines @property def base_package(self): @@ -295,12 +295,14 @@ class SpecFile(object): ''' try: files = self._get_pkg_by_name(pkg_name).fileList - return [l for l in [f.decode('utf-8').strip() - for f in files.split(b'\n')] if l] except AttributeError: # No fileList attribute... # https://bugzilla.redhat.com/show_bug.cgi?id=857653 return self._parse_files(pkg_name) + if files is None: + return None + return [l for l in [f.decode('utf-8').strip() + for f in files.split(b'\n')] if l] def get_section(self, section, raw=False): '''