Skip to content

Commit

Permalink
Resolves #4100
Browse files Browse the repository at this point in the history
you don't have an interactive prompt in the gui-updater, so you
shouldn't use a tty and --batch or --no-tty is meant for such tings.

--no-tty
     Make sure that the TTY (terminal) is never used for any output.
This option is needed in some cases because
     GnuPG sometimes prints warnings to the TTY if if --batch is used.

--batch
Use batch mode.  Never ask, do not allow interactive commands.

The test, which uses a subshell, is looking for errors on the cli, this
should be changed.
  • Loading branch information
kwadronaut authored and heartsucker committed Mar 14, 2019
1 parent 7dae7a7 commit 7279086
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion admin/securedrop_admin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,8 @@ def check_for_updates(args):


def get_release_key_from_keyserver(args, keyserver=None, timeout=45):
gpg_recv = ['timeout', str(timeout), 'gpg', '--recv-key']
gpg_recv = ['timeout', str(timeout), 'gpg', '--batch', '--no-tty',
'--recv-key']
release_key = [RELEASE_KEY]

# We construct the gpg --recv-key command based on optional keyserver arg.
Expand Down

0 comments on commit 7279086

Please sign in to comment.