bootstrap: Remove duplicate dict key

Commit 86d4836919e29c0bdf927658df641811247534c6 added python36-gpg, but
the duplicate key lower down in the same dict meant it never had any
effect. Now it does.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 17497eb82f04a729b8d41e09255faf1b0224db59..334fb69641b1210c862db2b196f6304296009a63 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 42c62d342018c7adbc6aae5a6025df322cc03c18
+  SAMBA_CI_CONTAINER_TAG: 7f3f1172a1da12271a0bc5a48eae4679691e386b
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 1ea8a51983edf277f533c1979baca7345b895c25..45fbc7b64427f17f7f100f78f7a3aa91d6a9cbbe 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -455,7 +455,6 @@ RPM_DISTS = {
             # after epel-release installed
             # however, all other python3 pkgs are still python36-ish
             'python2-gpg': 'pygpgme',
-            'python3-gpg': '',  # no python3-gpg yet
             '@development-tools': '"@Development Tools"',  # add quotes
             'glibc-langpack-en': '',  # included in glibc-common
             'glibc-locale-source': '',  # included in glibc-common

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 7cf9983d11f910de3fa75eaae853536b539d131e..da39b8a8a61b9b577562877b72213b88bea4c8f1 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -88,6 +88,7 @@ yum install -y \
     python36-cryptography \
     python36-devel \
     python36-dns \
+    python36-gpg \
     python36-iso8601 \
     python36-markdown \
     python36-pyasn1 \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 57dcf2a68a242055afc362cc6cf51257340affbd..76847af609d4ec5a5de8a33476f54f70f9b563ad 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -74,6 +74,7 @@ packages:
   - python36-cryptography
   - python36-devel
   - python36-dns
+  - python36-gpg
   - python36-iso8601
   - python36-markdown
   - python36-pyasn1

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index dbc778673185b5f682fe009e57de6950d0c327fe..851b06db5a60f9047ea30e0b0e8a854c0fc62140 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-42c62d342018c7adbc6aae5a6025df322cc03c18
+7f3f1172a1da12271a0bc5a48eae4679691e386b