From 03ad610caf15ed57885b71f083e454fbdbff79fb Mon Sep 17 00:00:00 2001 From: Marcus Huewe Date: Mon, 16 Aug 2010 16:06:17 +0200 Subject: [PATCH] - move 'builtin_signature_check' into conf module --- osc/conf.py | 3 ++- osc/fetch.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/osc/conf.py b/osc/conf.py index 493efcec..bcb1730d 100644 --- a/osc/conf.py +++ b/osc/conf.py @@ -79,6 +79,7 @@ DEFAULTS = { 'apiurl': 'https://api.opensuse.org', 'build-vmdisk-swapsize': '', # optional for VM builds 'build-jobs': os.sysconf('SC_NPROCESSORS_ONLN'), # compile with N jobs + 'builtin_signature_check': '1', # by default use builtin check for verify pkgs 'icecream': '0', 'debug': '0', @@ -135,7 +136,7 @@ config = DEFAULTS.copy() boolean_opts = ['debug', 'do_package_tracking', 'http_debug', 'post_mortem', 'traceback', 'check_filelist', 'plaintext_passwd', 'checkout_no_colon', 'check_for_request_on_action', 'linkcontrol', 'show_download_progress', 'request_show_interactive', - 'use_keyring', 'gnome_keyring', 'no_verify'] + 'use_keyring', 'gnome_keyring', 'no_verify', 'builtin_signature_check'] api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'email', 'sslcertck', 'cafile', 'capath', 'trusted_prj'] diff --git a/osc/fetch.py b/osc/fetch.py index 6ecc63fd..acac3ff6 100644 --- a/osc/fetch.py +++ b/osc/fetch.py @@ -313,7 +313,7 @@ def verify_pacs(bi): """ pac_list = [ i.fullfilename for i in bi.deps ] - if not conf.config.get('builtin_signature_check', True): + if not conf.config['builtin_signature_check']: return verify_pacs_old(pac_list) if not pac_list: