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 01-20-2012, 12:33 PM
Allan McRae
 
Default makepkg: retrist usage of flags passed to pacman

multitypo! RESTRICT usage...


On 20/01/12 23:28, Allan McRae wrote:
> With pacman-4.0, using --noconfirm or --noprogressbar with -Q or -T
> results in pacman reporting an "invalid option" error. Restrict the
> passing of these options to pacman. Fixes FS#28012.
>
> Signed-off-by: Allan McRae <allan@archlinux.org>
> ---
> scripts/makepkg.sh.in | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 4792c5c..4f95b73 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -412,7 +412,11 @@ download_file() {
>
> run_pacman() {
> local cmd
> - printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@"
> + if [[ ! $1 = -@(T|Qq) ]]; then
> + printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@"
> + else
> + printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@"
> + fi
> if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then
> if type -p sudo >/dev/null; then
> cmd="sudo $cmd"
 
Old 01-20-2012, 07:46 PM
Allan McRae
 
Default makepkg: retrist usage of flags passed to pacman

On 21/01/12 03:35, Dan McGee wrote:
> On Fri, Jan 20, 2012 at 7:28 AM, Allan McRae <allan@archlinux.org> wrote:
>> With pacman-4.0, using --noconfirm or --noprogressbar with -Q or -T
>> results in pacman reporting an "invalid option" error. Restrict the
>> passing of these options to pacman. Fixes FS#28012.
>>
>> Signed-off-by: Allan McRae <allan@archlinux.org>
>> ---
>> scripts/makepkg.sh.in | 6 +++++-
>> 1 files changed, 5 insertions(+), 1 deletions(-)
>>
>> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
>> index 4792c5c..4f95b73 100644
>> --- a/scripts/makepkg.sh.in
>> +++ b/scripts/makepkg.sh.in
>> @@ -412,7 +412,11 @@ download_file() {
>>
>> run_pacman() {
>> local cmd
>> - printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@"
>> + if [[ ! $1 = -@(T|Qq) ]]; then
>> + printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@"
>> + else
>> + printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@"
> Am I missing something here? These two printf lines still look identical...

Yeah... the second line does not have $PACMAN_OPTS. See my working
branch. Not sure how it got into the email....

>> + fi
>> if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then
>> if type -p sudo >/dev/null; then
>> cmd="sudo $cmd"
>> --
>> 1.7.8.4
>>
>>
>
 

Thread Tools




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

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