yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for reviews (OBS issue is fixed)

Browse Source
This commit is contained in:
Stephan Kulow 2019-11-19 15:33:09 +01:00
parent ffe92526fa
commit d126c8a357
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osclib/adi_command.py
View File

@ -42,9 +42,9 @@ class AdiCommand:
return return
for review in info.findall('missing_reviews/review'): for review in info.findall('missing_reviews/review'):
print(query_project + ' ' + Fore.WHITE + 'review: ' + '{} for {}[{}]'.format( print(query_project + ' ' + Fore.WHITE + 'review: ' + '{} for {}[{}]'.format(
Fore.YELLOW + review.get('by', 'https://github.com/openSUSE/open-build-service/issues/8575') + Fore.RESET, Fore.YELLOW + self.api.format_review(review) + Fore.RESET,
Fore.CYAN + review.get('package') + Fore.RESET, Fore.CYAN + review.get('package') + Fore.RESET,
review.get('id', 'https://github.com/openSUSE/open-build-service/issues/8575'))) review.get('request')))
return return
for check in info.findall('missing_checks/check'): for check in info.findall('missing_checks/check'):
print(query_project + ' ' + Fore.MAGENTA + 'missing: {}'.format(check.get('name'))) print(query_project + ' ' + Fore.MAGENTA + 'missing: {}'.format(check.get('name')))

10
osclib/check_command.py
View File

@ -31,13 +31,13 @@ class CheckCommand(object):
break break
# Missing reviews # Missing reviews
for r in project.findall('missing_reviews/*'): for r in project.findall('missing_reviews/review'):
report.append(' - %s: Missing reviews: %s' % (r.get('package'), r.get('by'))) report.append(' - %s: Missing reviews: %s' % (r.get('package'), self.api.format_review(r)))
if not verbose: if not verbose:
break break
# Building repositories # Building repositories
if project.find('building_repositories/*') is not None: if project.find('building_repositories/repo') is not None:
report.append(' - At least following repositories are still building:') report.append(' - At least following repositories are still building:')
for r in project.findall('building_repositories/*'): for r in project.findall('building_repositories/*'):
report.append(' %s/%s: %s' % (r.get('repository'), r.get('arch'), r.get('state'))) report.append(' %s/%s: %s' % (r.get('repository'), r.get('arch'), r.get('state')))
@ -45,9 +45,9 @@ class CheckCommand(object):
break break
# Broken packages # Broken packages
if project.find('broken_packages/*') is not None: if project.find('broken_packages/package') is not None:
report.append(' - Following packages are broken:') report.append(' - Following packages are broken:')
for r in project.findall('broken_packages/*'): for r in project.findall('broken_packages/package'):
report.append(' %s (%s): %s' % (r.get('package'), r.get('repository'), r.get('state'))) report.append(' %s (%s): %s' % (r.get('package'), r.get('repository'), r.get('state')))
if not verbose: if not verbose:
break break

13
osclib/stagingapi.py
View File

@ -796,6 +796,17 @@ class StagingAPI(object):
return False return False
def format_review(self, review):
if review.get('by_group'):
return 'group:{}'.format(review.get('by_group'))
if review.get('by_user'):
return review.get('by_user')
if review.get('by_package'):
return '{}/{}'.format(review.get('by_project'), review.get('by_package'))
if review.get('by_project'):
return review.get('by_project')
raise oscerr.WrongArgs('Invalid review')
def job_history_fail_count(self, history): def job_history_fail_count(self, history):
fail_count = 0 fail_count = 0
for job in reversed(history.findall('jobhist')): for job in reversed(history.findall('jobhist')):
@ -1198,7 +1209,7 @@ class StagingAPI(object):
def switch_flag_in_prj(self, project, flag='build', state='disable', repository=None, arch=None): def switch_flag_in_prj(self, project, flag='build', state='disable', repository=None, arch=None):
query = { 'cmd': 'set_flag', 'flag': flag, 'status': state } query = { 'cmd': 'set_flag', 'flag': flag, 'status': state }
if repository: if repository:
query['repository'] = _repository query['repository'] = repository
if arch: if arch:
query['arch'] = arch query['arch'] = arch
url = self.makeurl(['source', project], query) url = self.makeurl(['source', project], query)