FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 12-23-2011, 03:07 PM
Dave Reisner
 
Default pacman-key: Add some variable quotes and fix vim modeline for securemodelines

On Fri, Dec 23, 2011 at 03:15:12PM +0100, Timothy Redaelli wrote:
> From: Timothy Redaelli <timothy.redaelli@gmail.com>
>
> Signed-off-by: Timothy Redaelli <timothy.redaelli@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
>
>
 
Old 12-23-2011, 03:16 PM
Dan McGee
 
Default pacman-key: Add some variable quotes and fix vim modeline for securemodelines

On Fri, Dec 23, 2011 at 11:07 AM, Dave Reisner <d@falconindy.com> wrote:
> On Fri, Dec 23, 2011 at 03:15:12PM +0100, Timothy Redaelli wrote:
>> From: Timothy Redaelli <timothy.redaelli@gmail.com>
>>
>> Signed-off-by: Timothy Redaelli <timothy.redaelli@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.

I'm fine with the rest of the patch, but any time you use the word
"and" in a commit message I know it needs to be split up. And I concur
with Dave; please resubmit without the totally unrelated change here
(not to mention if we did this, we would do it in the ~100 other
source files using modelines as well...).

-Dan
 

Thread Tools




All times are GMT. The time now is 12:21 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org