diff --git a/check_source.py b/check_source.py index 988e4d03..ed1e98ab 100755 --- a/check_source.py +++ b/check_source.py @@ -17,6 +17,7 @@ from osclib.core import devel_project_fallback import urllib2 import ReviewBot from check_maintenance_incidents import MaintenanceChecker +from osclib.conf import str2bool class CheckSource(ReviewBot.ReviewBot): @@ -37,7 +38,8 @@ class CheckSource(ReviewBot.ReviewBot): self.staging_api(project) config = self.staging_config[project] - self.ignore_devel = not bool(config.get('devel-project-enforce', False)) + self.ignore_devel = not str2bool(config.get('devel-project-enforce', 'False')) + self.add_review_team = str2bool(config.get('check-source-add-review-team', 'True')) self.review_team = config.get('review-team') self.repo_checker = config.get('repo-checker') self.devel_whitelist = config.get('devel-whitelist', '').split() @@ -131,7 +133,7 @@ class CheckSource(ReviewBot.ReviewBot): self.review_messages['accepted'] += "\n\nOutput of check script (non-fatal):\n" + output if not self.skip_add_reviews: - if self.review_team is not None: + if self.add_review_team and self.review_team is not None: self.add_review(self.request, by_group=self.review_team, msg='Please review sources') if self.only_changes(): diff --git a/osclib/conf.py b/osclib/conf.py index 98f19737..d3c04891 100644 --- a/osclib/conf.py +++ b/osclib/conf.py @@ -73,6 +73,7 @@ DEFAULT = { 'main-repo': 'standard', 'download-baseurl': 'http://download.opensuse.org/distribution/leap/%(version)s/', 'download-baseurl-update': 'http://download.opensuse.org/update/leap/%(version)s/', + 'check-source-add-review-team': 'False', 'review-team': 'opensuse-review-team', 'legal-review-group': 'legal-auto', # check_source.py @@ -169,6 +170,10 @@ DEFAULT = { # +def str2bool(v): + return v.lower() in ("yes", "true", "t", "1") + + class Config(object): """Helper class to configuration file.""" diff --git a/pkglistgen.py b/pkglistgen.py index 60078e52..65b44fd7 100755 --- a/pkglistgen.py +++ b/pkglistgen.py @@ -39,7 +39,7 @@ from osc.core import Package from osc.core import show_results_meta from osc.core import undelete_package from osc import conf -from osclib.conf import Config +from osclib.conf import Config, str2bool from osclib.stagingapi import StagingAPI from osclib.util import project_list_family from osclib.util import project_list_family_prior @@ -1186,9 +1186,9 @@ class CommandLineInterface(ToolBase.CommandLineInterface): self.update_merge(nonfree if drop_list else False) print('-> do_solve') - opts.ignore_unresolvable = bool(target_config.get('pkglistgen-ignore-unresolvable')) - opts.ignore_recommended = bool(target_config.get('pkglistgen-ignore-recommended')) - opts.include_suggested = bool(target_config.get('pkglistgen-include-suggested')) + opts.ignore_unresolvable = str2bool(target_config.get('pkglistgen-ignore-unresolvable')) + opts.ignore_recommended = str2bool(target_config.get('pkglistgen-ignore-recommended')) + opts.include_suggested = str2bool(target_config.get('pkglistgen-include-suggested')) opts.locale = target_config.get('pkglistgen-local') opts.locales_from = target_config.get('pkglistgen-locales-from') self.do_solve('solve', opts)