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

osclib/list_command.py: Show details also for requests targeted to packages not in rings.

Browse Source 
This commit implements the ability to show for packages that do not
belong to any ring the same details that are shown for packages that do
live in rings.  Due to concerns about compatibility and volume of the
output the feature is hidden behind a new --adi-details command
line flag.
This commit is contained in:
Giacomo Leidi 2024-10-31 14:21:23 +01:00
parent 817ceac73e
commit 3edc4f008c
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osc-staging.py
View File

@ -93,6 +93,8 @@ def clean_args(args):
help='split the requests into individual groups')
@cmdln.option('--supersede', action='store_true',
help='replace staged requests when superseded')
@cmdln.option('--adi-details', action='store_true',
help='show detailed summary for packages that are not in any ring')
@cmdln.option('--filter-from', metavar='STAGING',
help='filter request list to only those from a specific staging')
@cmdln.option('-p', '--project', dest='project', metavar='PROJECT',
@ -307,7 +309,7 @@ def do_staging(self, subcmd, opts, *args):
osc staging frozenage [STAGING...]
osc staging ignore [-m MESSAGE] REQUEST...
osc staging unignore [--cleanup] [REQUEST...|all]
osc staging list [--supersede]
osc staging list [--supersede] [--adi-details]
osc staging lock [-m MESSAGE]
osc staging select [--no-freeze] [--remove-exclusion] [--move [--filter-from STAGING]]
STAGING REQUEST...
@ -578,7 +580,7 @@ def do_staging(self, subcmd, opts, *args):
elif cmd == 'unignore':
UnignoreCommand(api).perform(args[1:], opts.cleanup)
elif cmd == 'list':
ListCommand(api).perform(supersede=opts.supersede)
ListCommand(api).perform(supersede=opts.supersede, adi_details=opts.adi_details)
elif cmd == 'lock':
lock.hold(opts.message)
elif cmd == 'adi':

65
osclib/list_command.py
View File

@ -18,7 +18,32 @@ class ListCommand:
def __init__(self, api):
self.api = api
def perform(self, supersede=False):
def print_request(self, request):
hide_source = self.api.project == 'openSUSE:Factory'
request_id = int(request.get('id'))
action = request.find('action')
target_package = action.find('target').get('package')
ring = action.find('target').get('ring', None)
line = f"{request_id} {Fore.CYAN}{target_package:<30}{Fore.RESET}"
if ring:
ring_color = Fore.MAGENTA if ring.startswith('0') else ''
line += f" -> {ring_color}{ring:<12}{Fore.RESET}"
if not hide_source and action.find('source') is not None:
source_project = action.find('source').get('project')
source_project = self.project_strip(source_project)
line += f' ({Fore.YELLOW + source_project + Fore.RESET})'
if action.get('type') == 'delete':
line += ' (' + Fore.RED + 'delete request' + Fore.RESET + ')'
message = self.api.ignore_format(request_id)
if message:
line += '\n' + Fore.WHITE + message + Fore.RESET
print(' ', line)
def perform(self, supersede=False, adi_details=False):
"""
Perform the list command
"""
@ -34,39 +59,23 @@ class ListCommand:
splitter.group_by('./action/target/@devel_project')
splitter.split()
hide_source = self.api.project == 'openSUSE:Factory'
for group in sorted(splitter.grouped.keys()):
print(Fore.YELLOW + group)
for request in splitter.grouped[group]['requests']:
request_id = int(request.get('id'))
action = request.find('action')
target_package = action.find('target').get('package')
ring = action.find('target').get('ring')
ring_color = Fore.MAGENTA if ring.startswith('0') else ''
line = '{} {}{:<30}{} -> {}{:<12}{}'.format(
request_id, Fore.CYAN, target_package, Fore.RESET,
ring_color, ring, Fore.RESET)
if not hide_source and action.find('source') is not None:
source_project = action.find('source').get('project')
source_project = self.project_strip(source_project)
line += f' ({Fore.YELLOW + source_project + Fore.RESET})'
if action.get('type') == 'delete':
line += ' (' + Fore.RED + 'delete request' + Fore.RESET + ')'
message = self.api.ignore_format(request_id)
if message:
line += '\n' + Fore.WHITE + message + Fore.RESET
print(' ', line)
self.print_request(request)
if len(splitter.other):
non_ring_packages = []
for request in splitter.other:
non_ring_packages.append(request.find('./action/target').get('package'))
print('Not in a ring: ' + ' '.join(sorted(non_ring_packages)))
non_ring_requests = splitter.other
if adi_details:
print('Not in a ring: ')
for request in non_ring_requests:
self.print_request(request)
else:
non_ring_packages = sorted(
request.find('./action/target').get('package')
for request in non_ring_requests)
print('Not in a ring: ' + ' '.join(non_ring_packages))
# Print requests not handled by staging process to highlight them.
splitter.stageable = False