Merge branch 'release/v0.2.0'

Conflicts:
	README.txt

1 files changed, 44 insertions, 0 deletions

diff --git a/src/leap/util/leap_argparse.py b/src/leap/util/leap_argparse.py
new file mode 100644
index 00000000..3412a72c
--- /dev/null
+++ b/src/leap/util/leap_argparse.py
@@ -0,0 +1,44 @@
+import argparse
+
+
+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 Encryption Access Project"
+    parser = argparse.ArgumentParser(description="""
+Launches the LEAP Client""", epilog=epilog)
+    parser.add_argument('-d', '--debug', action="store_true",
+                        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')
+    parser.add_argument('--openvpn-verbosity', nargs='?',
+                        type=int,
+                        action="store", dest="openvpn_verb",
+                        help='verbosity level for openvpn logs [1-6]')
+
+    # 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
+
+
+def init_leapc_args():
+    parser = build_parser()
+    opts, unknown = parser.parse_known_args()
+    return parser, opts