summaryrefslogtreecommitdiff
path: root/src/leap/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/util')
-rw-r--r--src/leap/util/leap_argparse.py37
-rw-r--r--src/leap/util/tests/test_leap_argparse.py6
2 files changed, 23 insertions, 20 deletions
diff --git a/src/leap/util/leap_argparse.py b/src/leap/util/leap_argparse.py
index 5b0775cc..3412a72c 100644
--- a/src/leap/util/leap_argparse.py
+++ b/src/leap/util/leap_argparse.py
@@ -6,16 +6,13 @@ def build_parser():
all the options for the leap arg parser
Some of these could be switched on only if debug flag is present!
"""
- epilog = "Copyright 2012 The Leap Project"
+ epilog = "Copyright 2012 The LEAP Encryption Access Project"
parser = argparse.ArgumentParser(description="""
-Launches main LEAP Client""", epilog=epilog)
+Launches the LEAP Client""", epilog=epilog)
parser.add_argument('-d', '--debug', action="store_true",
- help='launches in debug mode')
- parser.add_argument('-c', '--config', metavar="CONFIG FILE", nargs='?',
- action="store", dest="config_file",
- type=argparse.FileType('r'),
- help='optional config file')
- parser.add_argument('--logfile', metavar="LOG FILE", nargs='?',
+ help=("Launches client in debug mode, writing debug"
+ "info to stdout"))
+ parser.add_argument('-l', '--logfile', metavar="LOG FILE", nargs='?',
action="store", dest="log_file",
#type=argparse.FileType('w'),
help='optional log file')
@@ -23,15 +20,21 @@ Launches main LEAP Client""", epilog=epilog)
type=int,
action="store", dest="openvpn_verb",
help='verbosity level for openvpn logs [1-6]')
- parser.add_argument('-l', '--no-provider-checks',
- action="store_true", default=False,
- help="skips download of provider config files. gets "
- "config from local files only. Will fail if cannot "
- "find any")
- parser.add_argument('-k', '--no-ca-verify',
- action="store_true", default=False,
- help="(insecure). Skips verification of the server "
- "certificate used in TLS handshake.")
+
+ # Not in use, we might want to reintroduce them.
+ #parser.add_argument('-i', '--no-provider-checks',
+ #action="store_true", default=False,
+ #help="skips download of provider config files. gets "
+ #"config from local files only. Will fail if cannot "
+ #"find any")
+ #parser.add_argument('-k', '--no-ca-verify',
+ #action="store_true", default=False,
+ #help="(insecure). Skips verification of the server "
+ #"certificate used in TLS handshake.")
+ #parser.add_argument('-c', '--config', metavar="CONFIG FILE", nargs='?',
+ #action="store", dest="config_file",
+ #type=argparse.FileType('r'),
+ #help='optional config file')
return parser
diff --git a/src/leap/util/tests/test_leap_argparse.py b/src/leap/util/tests/test_leap_argparse.py
index 082919b7..4e2b811f 100644
--- a/src/leap/util/tests/test_leap_argparse.py
+++ b/src/leap/util/tests/test_leap_argparse.py
@@ -24,11 +24,11 @@ class LeapArgParseTest(unittest.TestCase):
self.assertEqual(
opts,
Namespace(
- config_file=None,
debug=True,
log_file=None,
- no_provider_checks=False,
- no_ca_verify=False,
+ #config_file=None,
+ #no_provider_checks=False,
+ #no_ca_verify=False,
openvpn_verb=None))
if __name__ == "__main__":