diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2022-05-05 21:04:02 +1200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2022-06-10 06:56:38 +0000 |
| commit | 6b58061d22993d991463c25765656a77281397ef (patch) | |
| tree | 16e369f9e3967803140cd5daeb5395a69fea7cb8 /bootstrap | |
| parent | 4f7c6ba50bf6cab91aae9d077ccfb3b43e34de9f (diff) | |
| download | samba-6b58061d22993d991463c25765656a77281397ef.tar.gz | |
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>
Diffstat (limited to 'bootstrap')
| -rw-r--r-- | bootstrap/config.py | 1 | ||||
| -rwxr-xr-x | bootstrap/generated-dists/centos7/bootstrap.sh | 1 | ||||
| -rw-r--r-- | bootstrap/generated-dists/centos7/packages.yml | 1 | ||||
| -rw-r--r-- | bootstrap/sha1sum.txt | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/bootstrap/config.py b/bootstrap/config.py index 1ea8a51983e..45fbc7b6442 100644 --- 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 7cf9983d11f..da39b8a8a61 100755 --- 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 57dcf2a68a2..76847af609d 100644 --- 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 dbc77867318..851b06db5a6 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -42c62d342018c7adbc6aae5a6025df322cc03c18 +7f3f1172a1da12271a0bc5a48eae4679691e386b |