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

Merge pull request #1447 from lnussel/pkglistgen

Browse Source 
pkglistgen: Fix reading boolean values
This commit is contained in:
Ludwig Nussel 2018-03-11 09:22:51 +01:00 committed by GitHub
commit ad6056258f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
check_source.py
View File

@ -17,6 +17,7 @@ from osclib.core import devel_project_fallback
import urllib2 import urllib2
import ReviewBot import ReviewBot
from check_maintenance_incidents import MaintenanceChecker from check_maintenance_incidents import MaintenanceChecker
from osclib.conf import str2bool
class CheckSource(ReviewBot.ReviewBot): class CheckSource(ReviewBot.ReviewBot):
@ -37,7 +38,8 @@ class CheckSource(ReviewBot.ReviewBot):
self.staging_api(project) self.staging_api(project)
config = self.staging_config[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.review_team = config.get('review-team')
self.repo_checker = config.get('repo-checker') self.repo_checker = config.get('repo-checker')
self.devel_whitelist = config.get('devel-whitelist', '').split() 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 self.review_messages['accepted'] += "\n\nOutput of check script (non-fatal):\n" + output
if not self.skip_add_reviews: 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') self.add_review(self.request, by_group=self.review_team, msg='Please review sources')
if self.only_changes(): if self.only_changes():

5
osclib/conf.py
View File

@ -73,6 +73,7 @@ DEFAULT = {
'main-repo': 'standard', 'main-repo': 'standard',
'download-baseurl': 'http://download.opensuse.org/distribution/leap/%(version)s/', 'download-baseurl': 'http://download.opensuse.org/distribution/leap/%(version)s/',
'download-baseurl-update': 'http://download.opensuse.org/update/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', 'review-team': 'opensuse-review-team',
'legal-review-group': 'legal-auto', 'legal-review-group': 'legal-auto',
# check_source.py # check_source.py
@ -169,6 +170,10 @@ DEFAULT = {
# #
def str2bool(v):
return v.lower() in ("yes", "true", "t", "1")
class Config(object): class Config(object):
"""Helper class to configuration file.""" """Helper class to configuration file."""

8
pkglistgen.py
View File

@ -39,7 +39,7 @@ from osc.core import Package
from osc.core import show_results_meta from osc.core import show_results_meta
from osc.core import undelete_package from osc.core import undelete_package
from osc import conf from osc import conf
from osclib.conf import Config from osclib.conf import Config, str2bool
from osclib.stagingapi import StagingAPI from osclib.stagingapi import StagingAPI
from osclib.util import project_list_family from osclib.util import project_list_family
from osclib.util import project_list_family_prior 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) self.update_merge(nonfree if drop_list else False)
print('-> do_solve') print('-> do_solve')
opts.ignore_unresolvable = bool(target_config.get('pkglistgen-ignore-unresolvable')) opts.ignore_unresolvable = str2bool(target_config.get('pkglistgen-ignore-unresolvable'))
opts.ignore_recommended = bool(target_config.get('pkglistgen-ignore-recommended')) opts.ignore_recommended = str2bool(target_config.get('pkglistgen-ignore-recommended'))
opts.include_suggested = bool(target_config.get('pkglistgen-include-suggested')) opts.include_suggested = str2bool(target_config.get('pkglistgen-include-suggested'))
opts.locale = target_config.get('pkglistgen-local') opts.locale = target_config.get('pkglistgen-local')
opts.locales_from = target_config.get('pkglistgen-locales-from') opts.locales_from = target_config.get('pkglistgen-locales-from')
self.do_solve('solve', opts) self.do_solve('solve', opts)