Merge pull request #50972 from pirogoeth/sjohn/2018.3-apt-key-batch

Use gpg's --batch in apt-key adv during repo key add
saltstack · Jan 3, 2019 · 4685e0e · 4685e0e
2 parents 44bc862 + cd3d755
commit 4685e0e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/salt/modules/aptpkg.py b/salt/modules/aptpkg.py
@@ -1945,7 +1945,7 @@ def get_repo_keys():
 
     # The double usage of '--with-fingerprint' is necessary in order to
     # retrieve the fingerprint of the subkey.
-    cmd = ['apt-key', 'adv', '--list-public-keys', '--with-fingerprint',
+    cmd = ['apt-key', 'adv', '--batch', '--list-public-keys', '--with-fingerprint',
            '--with-fingerprint', '--with-colons', '--fixed-list-mode']
 
     cmd_ret = __salt__['cmd.run_all'](cmd=cmd)
@@ -2045,7 +2045,7 @@ def add_repo_key(path=None, text=None, keyserver=None, keyid=None, saltenv='base
             error_msg = 'No keyid or keyid too short for keyserver: {0}'.format(keyserver)
             raise SaltInvocationError(error_msg)
 
-        cmd.extend(['adv', '--keyserver', keyserver, '--recv', keyid])
+        cmd.extend(['adv', '--batch', '--keyserver', keyserver, '--recv', keyid])
     elif keyid:
         error_msg = 'No keyserver specified for keyid: {0}'.format(keyid)
         raise SaltInvocationError(error_msg)
@@ -2342,10 +2342,10 @@ def mod_repo(repo, saltenv='base', **kwargs):
             if not imported:
                 http_proxy_url = _get_http_proxy_url()
                 if http_proxy_url:
-                    cmd = ['apt-key', 'adv', '--keyserver-options', 'http-proxy={0}'.format(http_proxy_url),
+                    cmd = ['apt-key', 'adv', '--batch', '--keyserver-options', 'http-proxy={0}'.format(http_proxy_url),
                            '--keyserver', keyserver, '--logger-fd', '1', '--recv-keys', keyid]
                 else:
-                    cmd = ['apt-key', 'adv', '--keyserver', keyserver,
+                    cmd = ['apt-key', 'adv', '--batch', '--keyserver', keyserver,
                            '--logger-fd', '1', '--recv-keys', keyid]
                 ret = __salt__['cmd.run_all'](cmd,
                                               python_shell=False,