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 07-10-2011, 08:00 AM
DJ Mills
 
Default Fix usage of GPG_KEYRING

Currently declared as an array, but expanded as a string.

Signed-off-by: DJ Mills <danielmills1@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 0d3729d..84e47bb 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -157,22 +157,22 @@ reload_keyring() {
# be updated automatically.
if [[ -r "${ADDED_KEYS}" ]]; then
msg "$(gettext "Appending official keys...")"
- local add_keys=$(${GPG_NOKEYRING} --keyring "${ADDED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)
+ local add_keys=$("${GPG_NOKEYRING[@]}" --keyring "${ADDED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)
for key_id in ${add_keys}; do
# There is no point in adding a key that will be deleted right after
if [[ -z "${removed_ids[$key_id]}" ]]; then
- ${GPG_NOKEYRING} --keyring "${ADDED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import
+ "${GPG_NOKEYRING[@]}" --keyring "${ADDED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import
fi
done
fi

if [[ -r "${DEPRECATED_KEYS}" ]]; then
msg "$(gettext "Appending deprecated keys...")"
- local add_keys=$(${GPG_NOKEYRING} --keyring "${DEPRECATED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)
+ local add_keys=$("${GPG_NOKEYRING[@]}" --keyring "${DEPRECATED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5)
for key_id in ${add_keys}; do
# There is no point in adding a key that will be deleted right after
if [[ -z "${removed_ids[$key_id]}" ]]; then
- ${GPG_NOKEYRING} --keyring "${DEPRECATED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import
+ "${GPG_NOKEYRING[@]}" --keyring "${DEPRECATED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import
fi
done
fi
--
1.7.6
 
Old 07-10-2011, 08:58 AM
DJ Mills
 
Default Fix usage of GPG_KEYRING

On Sun, Jul 10, 2011 at 4:58 AM, Allan McRae <allan@archlinux.org> wrote:
> Subject typo? *Fix usage of GPG_NOKEYRING?
>
> On 10/07/11 18:00, DJ Mills wrote:
>>
>> Currently declared as an array, but expanded as a string.
>
> Why not just do this in the previous patch where you change GPG_NOKEYRING to
> an array?
>
> Allan
>
>

Hah, I thought it was already like that. It's ridiculously late here, sorry
 
Old 07-10-2011, 08:58 AM
Allan McRae
 
Default Fix usage of GPG_KEYRING

Subject typo? Fix usage of GPG_NOKEYRING?

On 10/07/11 18:00, DJ Mills wrote:

Currently declared as an array, but expanded as a string.


Why not just do this in the previous patch where you change
GPG_NOKEYRING to an array?


Allan
 
Old 07-16-2011, 01:08 PM
Allan McRae
 
Default Fix usage of GPG_KEYRING

On 10/07/11 18:58, DJ Mills wrote:

On Sun, Jul 10, 2011 at 4:58 AM, Allan McRae<allan@archlinux.org> wrote:

Subject typo? Fix usage of GPG_NOKEYRING?

On 10/07/11 18:00, DJ Mills wrote:


Currently declared as an array, but expanded as a string.


Why not just do this in the previous patch where you change GPG_NOKEYRING to
an array?

Allan




Hah, I thought it was already like that. It's ridiculously late here, sorry



Any chance of resubmitting with those two patches joint as one and based
on top of my working branch?


Allan
 
Old 07-16-2011, 06:10 PM
DJ Mills
 
Default Fix usage of GPG_KEYRING

On Sat, Jul 16, 2011 at 9:08 AM, Allan McRae <allan@archlinux.org> wrote:
> On 10/07/11 18:58, DJ Mills wrote:
>>
>> On Sun, Jul 10, 2011 at 4:58 AM, Allan McRae<allan@archlinux.org> *wrote:
>>>
>>> Subject typo? *Fix usage of GPG_NOKEYRING?
>>>
>>> On 10/07/11 18:00, DJ Mills wrote:
>>>>
>>>> Currently declared as an array, but expanded as a string.
>>>
>>> Why not just do this in the previous patch where you change GPG_NOKEYRING
>>> to
>>> an array?
>>>
>>> Allan
>>>
>>>
>>
>> Hah, I thought it was already like that. It's ridiculously late here,
>> sorry
>>
>
> Any chance of resubmitting with those two patches joint as one and based on
> top of my working branch?
>
> Allan
>
>
>

Sure
 

Thread Tools




All times are GMT. The time now is 12:50 AM.

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