mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-26 09:56:13 +01:00
Code

- move 'builtin_signature_check' into conf module

Browse Source
This commit is contained in:
Marcus Huewe 2010-08-16 16:06:17 +02:00
parent 3ceef4d4f2
commit 03ad610caf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osc/conf.py
View File

@ -79,6 +79,7 @@ DEFAULTS = { 'apiurl': 'https://api.opensuse.org',
'build-vmdisk-swapsize': '', # optional for VM builds 'build-vmdisk-swapsize': '', # optional for VM builds
'build-jobs': os.sysconf('SC_NPROCESSORS_ONLN'), # compile with N jobs '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', 'icecream': '0',
'debug': '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', 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', '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'] api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'email', 'sslcertck', 'cafile', 'capath', 'trusted_prj']

2
osc/fetch.py
View File

@ -313,7 +313,7 @@ def verify_pacs(bi):
""" """
pac_list = [ i.fullfilename for i in bi.deps ] 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) return verify_pacs_old(pac_list)
if not pac_list: if not pac_list: