Commit 83712063 authored by Lucas Carvalho's avatar Lucas Carvalho

Simplified the code related to signature_private_key_file argument.

Well the argument signature_private_key_file is supported as:
  - comand line: --signature-private-key-file
  - configuration file: signature_private_key_file
parent 48cb428e
...@@ -170,11 +170,9 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple): ...@@ -170,11 +170,9 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
master_ca_file = option_dict.get('master_ca_file') master_ca_file = option_dict.get('master_ca_file')
# If it was not passed as argument, we must check if it was defined into # If it was not passed as argument, we must check if it was defined into
# the configuration file. # the configuration file.
signature_private_key_file = option_dict.get('signature_private_key_file') \ signature_private_key_file = option_dict.get('signature_private_key_file', '')
or option_dict.get('signature-private-key-file')
for f in [key_file, cert_file, master_ca_file, signature_private_key_file]: for f in [key_file, cert_file, master_ca_file, signature_private_key_file]:
if f not in ('', None,):
if not os.path.exists(f): if not os.path.exists(f):
parser.error('File %r does not exists.' % f) parser.error('File %r does not exists.' % f)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment