openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Adds support for GPG keyring"

This commit is contained in:
Zuul 2019-11-22 06:57:38 +00:00 committed by Gerrit Code Review
parent 05a6f898fd 48ff601098
commit f268c72ed9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/dpkg/pre-install.d/02-add-apt-keys
View File

@ -26,7 +26,7 @@ if [ ! -d "${KEY_DIRECTORY}" ]; then
fi
for KEY in ${KEY_DIRECTORY}/*; do
if ! file -b "${KEY}" | grep -q 'PGP public key block'; then
if ! file -b "${KEY}" | grep -qE '(PGP public key block|GPG key public ring)'; then
echo "Skipping ${KEY}, not a valid GPG public key"
continue
fi