summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-10-17 16:05:46 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-10-17 16:05:46 -0300
commitd2c25d3b1e2c7e694a2a0dad0d9f75ec4df5c53b (patch)
treef8119af6476fda8dd669469beef6f3c097ad1171
parent562c895eb7759bb4d3eaf32608c1f7fd82473fd7 (diff)
parentc6478565432672bfc2f38e72a376c89e7bb2ef76 (diff)
Merge remote-tracking branch 'chiiph/bug/remove_danger_flag' into develop
-rw-r--r--changes/bug_disable_danger_flag1
-rw-r--r--src/leap/bitmask/util/leap_argparse.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/changes/bug_disable_danger_flag b/changes/bug_disable_danger_flag
new file mode 100644
index 00000000..2a555b17
--- /dev/null
+++ b/changes/bug_disable_danger_flag
@@ -0,0 +1 @@
+ o Disable --danger flag on release versions. Closes #4124. \ No newline at end of file
diff --git a/src/leap/bitmask/util/leap_argparse.py b/src/leap/bitmask/util/leap_argparse.py
index afe5be48..e8a9fda9 100644
--- a/src/leap/bitmask/util/leap_argparse.py
+++ b/src/leap/bitmask/util/leap_argparse.py
@@ -33,8 +33,7 @@ Launches Bitmask""", epilog=epilog)
parser.add_argument('-d', '--debug', action="store_true",
help=("Launches Bitmask in debug mode, writing debug"
"info to stdout"))
- # TODO: when we are ready to disable the --danger flag remove 'True or '
- if True or not IS_RELEASE_VERSION:
+ if not IS_RELEASE_VERSION:
help_text = "Bypasses the certificate check for bootstrap"
parser.add_argument('--danger', action="store_true", help=help_text)