[elbe-devel] [PATCH] Replace obsolete GNU privacy guard package name.

[Richard Cochran]

The gnupg2 deb is a dummy transitional package.  In ubuntu it has been
banished into the "universe" repository, and as a result it cannot be
found when building an elbe image for ubuntu bionic.  This patch fixes
the issue by changing the package name to plain old gnupg.

Signed-off-by: Richard Cochran <richardcochran at gmail.com>
---
 elbepack/egpg.py        | 2 +-
 elbepack/elbeproject.py | 2 +-
 elbepack/rfs.py         | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/elbepack/egpg.py b/elbepack/egpg.py
index 93926d53e..55a624e99 100644
--- a/elbepack/egpg.py
+++ b/elbepack/egpg.py
@@ -180,7 +180,7 @@ def unlock_key(fingerprint):
                         '/var/cache/elbe/gnupg')
     key = ctx.get_key(fingerprint, secret=True)
     keygrip = key.subkeys[0].keygrip
-    system("/usr/lib/gnupg2/gpg-preset-passphrase "
+    system("/usr/lib/gnupg/gpg-preset-passphrase "
            "--preset -P requiredToAvoidUserInput %s" % str(keygrip),
            env_add={"GNUPGHOME": "/var/cache/elbe/gnupg"})
 
diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index d95dd4b1c..0c7b69139 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -783,7 +783,7 @@ class ElbeProject (object):
 
         # Run pbuilder --create
         self.log.do('pbuilder --create --configfile "%s" --aptconfdir "%s" '
-                    '--debootstrapopts --include="git gnupg2"' % (
+                    '--debootstrapopts --include="git gnupg"' % (
                         os.path.join(self.builddir, "pbuilderrc"),
                         os.path.join(self.builddir, "aptconfdir")))
 
diff --git a/elbepack/rfs.py b/elbepack/rfs.py
index 97aa48b45..e12051e0f 100644
--- a/elbepack/rfs.py
+++ b/elbepack/rfs.py
@@ -192,10 +192,10 @@ class BuildEnv (object):
             includepkgs = self.xml.node("target/debootstrapvariant").et.get("includepkgs")
             strapcmd += '--variant="%s" ' % bootstrapvariant
 
-        if includepkgs and not "gnupg2" in includepkgs.split(','):
-            includepkgs += ",gnupg2"
+        if includepkgs and not "gnupg" in includepkgs.split(','):
+            includepkgs += ",gnupg"
         if not includepkgs:
-            includepkgs = "gnupg2"
+            includepkgs = "gnupg"
 
         strapcmd += ' --include="%s"' % includepkgs
 
-- 
2.20.1