[Pkg-privacy-commits] [tails-installer] 01/03: Temporarily disable command-line options parsing.

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to annotated tag tails-installer_5.0.1
in repository tails-installer.

commit f071b0f41272196712facbe1a5052ec39d7608ad
Author: anonym <anonym at riseup.net>
Date:   Mon Sep 25 13:44:56 2017 +0200

    Temporarily disable command-line options parsing.
    
    We only keep --verbose for now. This is a follow-up on commit
    1111fa4cc0e4ec018b8ded72f126404b4777b3d2.
    
    Refs: #8861
---
 tails-installer | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tails-installer b/tails-installer
index 8212ab1..65f9616 100755
--- a/tails-installer
+++ b/tails-installer
@@ -72,7 +72,16 @@ def parse_args():
     #                        ' for booting in USB-ZIP mode with legacy BIOSes. '
     #                        'WARNING:  This will erase everything on your '
     #                        'device!')
-    return parser.parse_args() # (opts, args)
+
+    # Let's override argv to effectively ignore the command-line
+    # arguments until #8861 is solved. We do this (as opposed to
+    # removing this code) to cheaply ensure we get the same default
+    # options set.
+    override_argv = []
+    # But for our own debugging purposes we still allow these:
+    if '--verbose' in sys.argv or os.getenv('DEBUG') == '1':
+        override_argv.append('--verbose')
+    return parser.parse_args(override_argv)
 
 
 def main():

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git