[pacman-dev] [PATCH] pacman-key: Add some variable quotes and fix vim modeline for securemodelines

Dave Reisner d at falconindy.com
Fri Dec 23 11:07:12 EST 2011


On Fri, Dec 23, 2011 at 03:15:12PM +0100, Timothy Redaelli wrote:
> From: Timothy Redaelli <timothy.redaelli at gmail.com>
> 
> Signed-off-by: Timothy Redaelli <timothy.redaelli at gmail.com>
> ---
>  scripts/pacman-key.sh.in |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
> index e0f48f5..c033da4 100644
> --- a/scripts/pacman-key.sh.in
> +++ b/scripts/pacman-key.sh.in
> @@ -450,9 +450,9 @@ fi
>  # file, falling back on a hard default
>  PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" "@sysconfdir@/pacman.d/gnupg")}
>  
> -GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning)
> +GPG_PACMAN=(gpg --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning)
>  if [[ -n ${KEYSERVER} ]]; then
> -	GPG_PACMAN+=(--keyserver ${KEYSERVER})
> +	GPG_PACMAN+=(--keyserver "${KEYSERVER}")
>  fi
>  
>  # check only a single operation has been given
> @@ -492,11 +492,11 @@ fi
>  (( POPULATE )) && populate_keyring
>  (( RECEIVE )) && "${GPG_PACMAN[@]}" --recv-keys "${KEYIDS[@]}"
>  (( REFRESH )) && "${GPG_PACMAN[@]}" --refresh-keys "${KEYIDS[@]}"
> -(( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE
> +(( VERIFY )) && "${GPG_PACMAN[@]}" --verify "$SIGNATURE"
>  
>  if (( UPDATEDB )); then
>  	msg "$(gettext "Updating trust database...")"
>  	"${GPG_PACMAN[@]}" --batch --check-trustdb
>  fi
>  
> -# vim: set ts=2 sw=2 noet:
> +# vim: set ts=2 sw=2 noet

Nope. This breaks modelines for anyone not using the plugin.

> -- 
> 1.7.8.1
> 
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://mailman.archlinux.org/pipermail/pacman-dev/attachments/20111223/18b0e900/attachment.asc>


More information about the pacman-dev mailing list