Merge branch 'release-0.2.2'0.2.2

1 files changed, 24 insertions, 1 deletions

diff --git a/src/leap/util/leap_argparse.py b/src/leap/util/leap_argparse.py
index 3412a72c..8300e4d8 100644
--- a/src/leap/util/leap_argparse.py
+++ b/src/leap/util/leap_argparse.py
@@ -1,9 +1,26 @@
+# -*- coding: utf-8 -*-
+# leap_argparse.py
+# Copyright (C) 2013 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 import argparse
 
 
 def build_parser():
     """
-    all the options for the leap arg 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"
@@ -12,6 +29,8 @@ 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('--danger', action="store_true",
+                        help=("Bypasses the certificate check for bootstrap"))
     parser.add_argument('-l', '--logfile', metavar="LOG FILE", nargs='?',
                         action="store", dest="log_file",
                         #type=argparse.FileType('w'),
@@ -20,6 +39,10 @@ Launches the LEAP Client""", epilog=epilog)
                         type=int,
                         action="store", dest="openvpn_verb",
                         help='verbosity level for openvpn logs [1-6]')
+    parser.add_argument('-s', '--standalone', action="store_true",
+                        help='Makes the client use standalone'
+                        'directories for configuration and binary'
+                        'searching')
 
     # Not in use, we might want to reintroduce them.
     #parser.add_argument('-i', '--no-provider-checks',