actually merge the release/v0.2.0 branch!

My life has been a lie until this moment...
I had done:
git merge -s ours release/v0.2.0
to avoid deleting the debian folder...
but that left the src untouched...

Now I just rm'd the src folder and did a
git checkout release/v0.2.0 src/
... and merge happy! :)

1 files changed, 33 insertions, 9 deletions

diff --git a/src/leap/util/leap_argparse.py b/src/leap/util/leap_argparse.py
index 9c355134..3412a72c 100644
--- a/src/leap/util/leap_argparse.py
+++ b/src/leap/util/leap_argparse.py
@@ -2,19 +2,43 @@ import argparse
 
 
 def build_parser():
-    epilog = "Copyright 2012 The Leap Project"
+    """
+    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 main LEAP Client""", epilog=epilog)
-    parser.add_argument('--debug', action="store_true",
-                        help='launches in debug mode')
-    parser.add_argument('--config', metavar="CONFIG FILE", nargs='?',
-                        action="store", dest="config_file",
-                        type=argparse.FileType('r'),
-                        help='optional config file')
+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 = parser.parse_args()
+    opts, unknown = parser.parse_known_args()
     return parser, opts