elbepack: fix create_pbuilder() with debootstrap_key_path set

The keyring argument that is forwarded to debootstrap by pbuilder
needs to exist prior to calling pbuilder. Hence creating the file
in a pbuilder hook is too late.

Also debootstrap can only handle unarmored GPG keys, otherwise
it fails with a confusing error message.

Author: tobiasjakobi-lr

elbepack/elbeproject.py

@@ -873,6 +873,9 @@ def create_pbuilder(self, cross, noccache, ccachesize):
                 '--aptconfdir', os.path.join(self.builddir, 'aptconfdir'),
                 '--debootstrapopts', '--include=git,gnupg', *no_check_gpg, *keyring])
 
+        if debootstrap_key_path:
+            os.remove(debootstrap_key_path)
+
     def sync_xml_to_disk(self):
         try:
             sourcexmlpath = os.path.join(self.builddir, 'source.xml')

elbepack/pbuilder.py

@@ -4,8 +4,10 @@
 
 import os
 import pathlib
+from tempfile import NamedTemporaryFile
 from urllib.request import urlopen
 
+from elbepack.egpg import unarmor_openpgp_keyring
 from elbepack.treeutils import strip_leading_whitespace_from_lines
 
 
@@ -177,8 +179,16 @@ def pbuilder_get_debootstrap_key_path(chrootpath, xml):
     # If we have a primary key for use with debootstrap, BuildEnv.debootstrap
     # will have added the key. We use the same key for the pbuilder
     # debootstrap options.
-    if get_debootstrap_key(xml):
-        return os.path.join(chrootpath, 'etc', 'apt', 'trusted.gpg.d', 'elbe-xml-primary-key.gpg')
+    key = get_debootstrap_key(xml)
+    if key is None:
+        return None
+
+    tmp_file = NamedTemporaryFile(delete=False)
+
+    tmp_file.write(unarmor_openpgp_keyring(key))
+    tmp_file.close()
+
+    return tmp_file.name
 
 
 def get_apt_keys(builddir, xml):

elbepack/rfs.py

@@ -155,7 +155,7 @@ def _cleanup_bootstrap(self):
     def import_debootstrap_key(self, key):
         if key:
             k = strip_leading_whitespace_from_lines(key)
-            return self.add_key(unarmor_openpgp_keyring(k), 'elbe-xml-primary-key.gpg')
+            return self.add_key(unarmor_openpgp_keyring(k), 'elbe-xml-primary-key')
 
     def _strapcmd(self, arch, suite, cross, mmdebstrap):
         primary_mirror = self.xml.get_primary_mirror(