Merge remote-tracking branch 'origin/master'

Author: azubieta

appimagebuilder/app_dir/deploy/pacman/venv.py

@@ -9,17 +9,19 @@
 #
 #   The above copyright notice and this permission notice shall be included in
 #   all copies or substantial portions of the Software.
+import glob
 import logging
 import os
 import re
 import shlex
 import subprocess
 import sys
 from pathlib import Path
+from tempfile import TemporaryDirectory
 
 from appimagebuilder.common import shell
 
-DEPENDS_ON = ["bsdtar", "pacman", "pacman-key", "fakeroot"]
+DEPENDS_ON = ["bsdtar", "pacman", "pacman-key", "fakeroot", "gpg-agent"]
 
 
 class PacmanVenvError(RuntimeError):
@@ -160,11 +162,33 @@ def _generate_config(self):
                         f.write("Server = %s\n" % server)
 
     def _configure_keyring(self):
-        self._run_command("{fakeroot} {pacman-key} --config {config} --init")
-        self._run_command(
-            "{fakeroot} {pacman-key} --config {config} --populate archlinux"
+        keyrings = list(
+            map(
+                lambda x: x.split('.gpg')[0],
+                [os.path.basename(x) for x in glob.glob('/usr/share/pacman/keyrings/*.gpg')]
+            )
         )
 
+        with TemporaryDirectory(prefix="appimage-builder.") as temp_dir:
+            temp_gnupg_dir = str(Path(temp_dir) / 'gnupg')
+            
+            os.symlink(self._gpg_dir.absolute(), temp_gnupg_dir, target_is_directory=True)
+
+            proc_gpgagent = self._run_command(
+                "{fakeroot} {gpg-agent} --homedir"
+                f" {temp_gnupg_dir}"
+                " --daemon",
+                assert_success=False,
+                wait_for_completion=False
+            )
+            self._run_command("{fakeroot} {pacman-key} --config {config} --init")
+            self._run_command(
+                "{fakeroot} {pacman-key} --config {config} --populate "
+                f"{' '.join(keyrings)}"
+            )
+
+            proc_gpgagent.terminate()
+
     def _run_command(
         self,
         command,