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

repo_checker: drop whitelist_clean sub-command.

Browse Source 
No longer needed since the whitelist is no longer managed manually.
This commit is contained in:
Jimmy Berry 2018-08-03 14:46:17 -05:00
parent 9fdea5fbee
commit 2809f3934a
1 changed files with 0 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
repo_checker.py
View File

@ -91,7 +91,6 @@ class RepoChecker(ReviewBot.ReviewBot):
text = '\n'.join(comment).strip()
if not self.dryrun:
api.dashboard_content_ensure('repo_checker', text + '\n', 'project_only run')
self.whitelist_clean(project)
else:
print(text)
@ -551,83 +550,6 @@ class RepoChecker(ReviewBot.ReviewBot):
self.review_messages['accepted'] = 'delete request is safe'
return True
def whitelist_clean(self, project, interactive=False):
from copy import copy
from difflib import unified_diff
from osclib.core import BINARY_REGEX
api = self.staging_api(project)
# Determine which binaries are mentioned in repo_checker output.
content = api.dashboard_content_load('repo_checker')
sections = self.install_check_parse(content)
binaries = set()
for section in sections:
for binary in section.binaries:
match = re.match(BINARY_REGEX, binary)
if match:
binaries.add(match.group('name'))
# Find whitelist config entries and filter list to only those mentioned.
prefix = 'repo_checker-binary-whitelist'
binaries_common = None
whitelists = {}
whitelists_remaining = {}
for key, value in self.staging_config[project].items():
if not key.startswith(prefix):
continue
whitelists[key] = set(value.split())
whitelists_remaining[key] = whitelists[key].intersection(binaries)
if key != prefix:
if binaries_common is None:
binaries_common = whitelists_remaining[key]
else:
binaries_common = binaries_common.intersection(whitelists_remaining[key])
if binaries_common is not None and len(binaries_common):
# Remove entries common to all archs and place in common whitelist.
whitelists_remaining[prefix].update(binaries_common)
for key, value in whitelists_remaining.items():
if key == prefix:
continue
whitelists_remaining[key] = whitelists_remaining[key] - binaries_common
# Update whitelist entries with new values.
config = api.attribute_value_load('Config').splitlines(True)
config_new = copy(config)
for key, value in whitelists_remaining.items():
if value != whitelists[key]:
self.whitelist_clean_set(config_new, key, ' '.join(sorted(value)))
if config == config_new:
print('No changes')
return
# Present diff and prompt to apply.
print(''.join(unified_diff(config, config_new, fromfile='config.orig', tofile='config.new')))
print('Apply config changes? [y/n] (y): ', end='')
if interactive:
response = raw_input().lower()
if response != '' and response != 'y':
print('quit')
return
else:
print('y')
api.attribute_value_save('Config', ''.join(config_new))
def whitelist_clean_set(self, config, key, value):
# Unfortunately even OscConfigParser does not preserve empty lines.
for i, line in enumerate(config):
if line.startswith(key + ' ='):
config[i] = '{} = {}\n'.format(key, value) if value else '{} =\n'.format(key)
return config
class CommandLineInterface(ReviewBot.CommandLineInterface):
@ -660,10 +582,6 @@ class CommandLineInterface(ReviewBot.CommandLineInterface):
self.checker.check_requests() # Needed to properly init ReviewBot.
self.checker.project_only(project, opts.post_comments)
def do_whitelist_clean(self, subcmd, opts, project):
self.checker.check_requests() # Needed to properly init ReviewBot.
self.checker.whitelist_clean(project, interactive=True)
if __name__ == "__main__":
app = CommandLineInterface()
sys.exit(app.main())