[pacman-dev] [PATCH] -Sqg and -Qqg

[Dan McGee]

On Wed, Jul 16, 2008 at 7:53 AM, Nagy Gabor <ngaba at bibl.u-szeged.hu> wrote:
> >From cc336eb3e44038fa1f7416d3dc79fc6dbe9e0004 Mon Sep 17 00:00:00 2001
> From: Nagy Gabor <ngaba at bibl.u-szeged.hu>
> Date: Wed, 16 Jul 2008 14:42:25 +0200
> Subject: [PATCH] -Sqg and -Qqg
>
> With --quiet, "pacman -Sg grp" and "pacman -Qg grp" don't list group names.
> "pacman -Qgq" and "pacman -Sggq" (without targets) still list group names.
The patch looks fine, but this commit message confuses me. The second
sentence should list commands without the -q option, right?

>
> Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
> ---
>  src/pacman/query.c |    7 ++++++-
>  src/pacman/sync.c  |    8 ++++++--
>  2 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/src/pacman/query.c b/src/pacman/query.c
> index 74d3ff2..bd2d8c5 100644
> --- a/src/pacman/query.c
> +++ b/src/pacman/query.c
> @@ -235,7 +235,12 @@ static int query_group(alpm_list_t *targets)
>                        if(grp) {
>                                const alpm_list_t *p, *packages = alpm_grp_get_pkgs(grp);
>                                for(p = packages; p; p = alpm_list_next(p)) {
> -                                       printf("%s %s\n", grpname, alpm_pkg_get_name(alpm_list_getdata(p)));
> +                                       if(!config->quiet) {
> +                                               printf("%s %s\n", grpname,
> +                                                               alpm_pkg_get_name(alpm_list_getdata(p)));
> +                                       } else {
> +                                               printf("%s\n", alpm_pkg_get_name(alpm_list_getdata(p)));
> +                                       }
>                                }
>                        } else {
>                                pm_fprintf(stderr, PM_LOG_ERROR, _("group \"%s\" was not found\n"), grpname);
> diff --git a/src/pacman/sync.c b/src/pacman/sync.c
> index 1e2af45..b299463 100644
> --- a/src/pacman/sync.c
> +++ b/src/pacman/sync.c
> @@ -357,8 +357,12 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets)
>                                if(grp) {
>                                        /* get names of packages in group */
>                                        for(k = alpm_grp_get_pkgs(grp); k; k = alpm_list_next(k)) {
> -                                               printf("%s %s\n", grpname,
> -                                                               alpm_pkg_get_name(alpm_list_getdata(k)));
> +                                               if(!config->quiet) {
> +                                                       printf("%s %s\n", grpname,
> +                                                                       alpm_pkg_get_name(alpm_list_getdata(k)));
> +                                               } else {
> +                                                       printf("%s\n", alpm_pkg_get_name(alpm_list_getdata(k)));
> +                                               }
>                                        }
>                                }
>                        }
> --
> 1.5.6.2
>
>
> _______________________________________________
> pacman-dev mailing list
> pacman-dev at archlinux.org
> http://archlinux.org/mailman/listinfo/pacman-dev
>