Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   ArchLinux Pacman Development (http://www.linux-archive.org/archlinux-pacman-development/)
-   -   makepkg: retrist usage of flags passed to pacman (http://www.linux-archive.org/archlinux-pacman-development/623159-makepkg-retrist-usage-flags-passed-pacman.html)

Allan McRae 01-20-2012 12:28 PM

makepkg: retrist usage of flags passed to pacman
 
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"
--
1.7.8.4

Dan McGee 01-20-2012 04:35 PM

makepkg: retrist usage of flags passed to pacman
 
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...

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


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

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.