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

Merge pull request #2332 from nilxam/more_fixes_unignore

Browse Source 
More fixes unignore
This commit is contained in:
Max Lin 2019-11-21 19:19:07 +08:00 committed by GitHub
commit e2105c5ed8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osclib/stagingapi.py
View File

@ -549,7 +549,7 @@ class StagingAPI(object):
url = self.makeurl(['staging', self.project, 'excluded_requests'])
root = ET.parse(self.retried_GET(url)).getroot()
for entry in root.findall('request'):
ignore[entry.get('id')] = entry.get('description')
ignore[int(entry.get('id'))] = entry.get('description')
return ignore
def add_ignored_request(self, request_id, comment):
@ -932,13 +932,6 @@ class StagingAPI(object):
if act_type == 'submit':
self.submit_to_prj(req.get_actions('submit')[0], project)
# unignore a request selected to a project
requests_ignored = self.get_ignored_requests()
request_id = int(request_id)
if request_id in requests_ignored:
del requests_ignored[request_id]
self.set_ignored_requests(requests_ignored)
return True
def get_sub_packages(self, package, project):
@ -1491,7 +1484,7 @@ class StagingAPI(object):
def ignore_format(self, request_id):
requests_ignored = self.get_ignored_requests()
if request_id in requests_ignored:
if int(request_id) in requests_ignored.keys():
ignore_indent = ' ' * (2 + len(str(request_id)) + 1)
return textwrap.fill(str(requests_ignored[request_id]),
initial_indent=ignore_indent,

2
osclib/unignore_command.py
View File

@ -25,7 +25,7 @@ class UnignoreCommand(object):
requests_ignored = {}
else:
for request_id in RequestFinder.find_sr(requests, self.api):
if request_id in requests_ignored:
if request_id in requests_ignored.keys():
print('{}: unignored'.format(request_id))
del requests_ignored[request_id]
self.api.del_ignored_request(request_id)