Merge pull request #2231 from lnussel/check_source

check_source: don't enforce name for kiwi images
This commit is contained in:
Ludwig Nussel 2019-09-25 11:17:50 +02:00 committed by GitHub
commit 9af682c9b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -150,7 +150,7 @@ class CheckSource(ReviewBot.ReviewBot):
shutil.rmtree(os.path.join(target_package, '.osc')) shutil.rmtree(os.path.join(target_package, '.osc'))
new_info = self.package_source_parse(source_project, source_package, source_revision) new_info = self.package_source_parse(source_project, source_package, source_revision)
if new_info['name'] != target_package: if not new_info['filename'].endswith('.kiwi') and new_info['name'] != target_package:
shutil.rmtree(dir) shutil.rmtree(dir)
self.review_messages['declined'] = "A package submitted as %s has to build as 'Name: %s' - found Name '%s'" % (target_package, target_package, new_info['name']) self.review_messages['declined'] = "A package submitted as %s has to build as 'Name: %s' - found Name '%s'" % (target_package, target_package, new_info['name'])
return False return False
@ -299,6 +299,9 @@ class CheckSource(ReviewBot.ReviewBot):
if xml.find('version') is not None: if xml.find('version') is not None:
ret['version'] = xml.find('version').text ret['version'] = xml.find('version').text
if xml.find('filename') is not None:
ret['filename'] = xml.find('filename').text
return ret return ret
def only_changes(self): def only_changes(self):