[tor-commits] [ooni-probe/master] Update the updater

[art at torproject.org]

commit 1046f0ec3692f57d80ee73488bcdabc56d6e315c
Author: Arturo Filastò <arturo at filasto.net>
Date:   Tue Sep 6 12:50:09 2016 +0200

    Update the updater
---
 data/updater.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/updater.py b/data/updater.py
index dc2fb2a..0f423ab 100755
--- a/data/updater.py
+++ b/data/updater.py
@@ -23,10 +23,10 @@ CURRENT_VERSION_PATH = "/etc/lepidopter-update/version"
 UPDATER_PATH = "/opt/ooni/updater/versions/"
 SCRIPT_INSTALL_PATH = "/opt/ooni/updater/updater.py"
 
-SYSTEMD_SCRIPT_PATH = "/etc/systemd/system/lepidopter-updater.service"
+SYSTEMD_SCRIPT_PATH = "/etc/systemd/system/lepidopter-update.service"
 SYSTEMD_SCRIPT = """\
 [Unit]
-Description=lepidopter-updater service
+Description=lepidopter-update service
 
 [Service]
 Type=simple
@@ -138,12 +138,13 @@ def verify_file(signature_path, signer_pk_path):
 
     try:
         try:
-            check_call(["gpg", "--yes", "-o", tmp_key, "--dearmor", signer_pk_path])
+            check_call(["gpg", "--batch", "--yes", "-o", tmp_key,
+                        "--dearmor", signer_pk_path])
         except CalledProcessError:
             raise InvalidPublicKey
 
         try:
-            output = check_output(["gpg", "--status-fd", "1",
+            output = check_output(["gpg", "--batch", "--status-fd", "1",
                                    "--no-default-keyring", "--keyring",
                                    tmp_key, "--trust-model", "always",
                                    "--verify", signature_path])