diff --recursive --unified pacman-3.0.6-orig/lib/libalpm/alpm.h pacman-3.0.6/lib/libalpm/alpm.h --- pacman-3.0.6-orig/lib/libalpm/alpm.h 2007-03-19 07:29:52.000000000 +0300 +++ pacman-3.0.6/lib/libalpm/alpm.h 2007-10-31 23:14:48.000000000 +0300 @@ -285,7 +285,8 @@ PM_TRANS_FLAG_DOWNLOADONLY = 0x200, PM_TRANS_FLAG_NOSCRIPTLET = 0x400, PM_TRANS_FLAG_NOCONFLICTS = 0x800, - PM_TRANS_FLAG_PRINTURIS = 0x1000 + PM_TRANS_FLAG_PRINTURIS = 0x1000, + PM_TRANS_FLAG_BEQUIET = 0x2000 } pmtransflag_t; /* Transaction Events */ diff --recursive --unified pacman-3.0.6-orig/src/pacman/pacman.c pacman-3.0.6/src/pacman/pacman.c --- pacman-3.0.6-orig/src/pacman/pacman.c 2007-03-22 20:47:28.000000000 +0300 +++ pacman-3.0.6/src/pacman/pacman.c 2007-11-01 00:02:30.000000000 +0300 @@ -133,6 +133,7 @@ printf(_(" -p, --file query a package file instead of the database\n")); printf(_(" -s, --search search locally-installed packages for matching strings\n")); printf(_(" -u, --upgrades list all packages that can be upgraded\n")); + printf(_(" -q --quiet show less information when query or search\n")); } else if(op == PM_OP_SYNC) { printf(_("usage: %s {-S --sync} [options] [package]\n"), myname); printf(_("options:\n")); @@ -149,6 +150,7 @@ printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); printf(_(" -y, --refresh download fresh package databases from the server\n")); printf(_(" --ignore ignore a package upgrade (can be used more than once)\n")); + printf(_(" -q --quiet show less information when query or search\n")); } printf(_(" --config set an alternate configuration file\n")); printf(_(" --noconfirm do not ask for any confirmation\n")); @@ -159,6 +161,7 @@ printf(_(" -r, --root set an alternate installation root\n")); printf(_(" -b, --dbpath set an alternate database location\n")); printf(_(" --cachedir set an alternate package cache location\n")); + printf(_(" -q --quiet show less information when query or search\n")); } } @@ -261,12 +264,13 @@ {"noscriptlet", no_argument, 0, 1005}, {"ask", required_argument, 0, 1006}, {"cachedir", required_argument, 0, 1007}, + {"quiet", no_argument, 0, 'q'}, {0, 0, 0, 0} }; struct stat st; unsigned short logmask; - while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepiuwyg", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepiuwygq", opts, &option_index))) { if(opt < 0) { break; } @@ -381,6 +385,9 @@ config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; case 'y': (config->op_s_sync)++; break; + case 'q': + config->flags |= PM_TRANS_FLAG_BEQUIET; + break; case '?': return(1); default: return(1); } diff --recursive --unified pacman-3.0.6-orig/src/pacman/query.c pacman-3.0.6/src/pacman/query.c --- pacman-3.0.6-orig/src/pacman/query.c 2007-03-22 17:05:13.000000000 +0300 +++ pacman-3.0.6/src/pacman/query.c 2007-10-31 23:44:48.000000000 +0300 @@ -147,16 +147,21 @@ alpm_list_t *grp; pmpkg_t *pkg = alpm_list_getdata(i); - printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + if (!(config->flags & PM_TRANS_FLAG_BEQUIET)) + printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + else + printf("%s", alpm_pkg_get_name(pkg)); + + if (!(config->flags & PM_TRANS_FLAG_BEQUIET)) { + if((grp = alpm_pkg_get_groups(pkg)) != NULL) { + group = alpm_list_getdata(grp); + printf(" (%s)\n ", (char *)alpm_list_getdata(grp)); + } else { + printf("\n "); + } - if((grp = alpm_pkg_get_groups(pkg)) != NULL) { - group = alpm_list_getdata(grp); - printf(" (%s)\n ", (char *)alpm_list_getdata(grp)); - } else { - printf("\n "); + indentprint(alpm_pkg_get_desc(pkg), 4); } - - indentprint(alpm_pkg_get_desc(pkg), 4); printf("\n"); } alpm_list_free(ret); @@ -286,17 +291,26 @@ } } if(match==0) { - MSG(NL, "%s %s\n", pkgname, pkgver); + if (!(config->flags & PM_TRANS_FLAG_BEQUIET)) + MSG(NL, "%s %s\n", pkgname, pkgver); + else + MSG(NL, "%s\n", pkgname); } } else if(config->op_q_list) { dump_pkg_files(info); } else if(config->op_q_orphans) { if(alpm_pkg_get_requiredby(info) == NULL && (long)alpm_pkg_get_reason(info) == PM_PKG_REASON_DEPEND) { - MSG(NL, "%s %s\n", pkgname, pkgver); + if (!(config->flags & PM_TRANS_FLAG_BEQUIET)) + MSG(NL, "%s %s\n", pkgname, pkgver); + else + MSG(NL, "%s\n", pkgname); } } else { - MSG(NL, "%s %s\n", pkgname, pkgver); + if (!(config->flags & PM_TRANS_FLAG_BEQUIET)) + MSG(NL, "%s %s\n", pkgname, pkgver); + else + MSG(NL, "%s\n", pkgname); } } } else { @@ -314,8 +328,12 @@ dump_pkg_files(info); } if(!config->op_q_info && !config->op_q_list) { - MSG(NL, "%s %s\n", alpm_pkg_get_name(info), - alpm_pkg_get_version(info)); + if (!(config->flags & PM_TRANS_FLAG_BEQUIET)) + MSG(NL, "%s %s\n", alpm_pkg_get_name(info), + alpm_pkg_get_version(info)); + else + MSG(NL, "%s\n", alpm_pkg_get_name(info)); + } if(config->op_q_changelog) { char changelog[PATH_MAX]; diff --recursive --unified pacman-3.0.6-orig/src/pacman/sync.c pacman-3.0.6/src/pacman/sync.c --- pacman-3.0.6-orig/src/pacman/sync.c 2007-03-26 22:31:57.000000000 +0400 +++ pacman-3.0.6/src/pacman/sync.c 2007-10-31 23:40:01.000000000 +0300 @@ -250,17 +250,25 @@ alpm_list_t *grp; pmpkg_t *pkg = alpm_list_getdata(j); - printf("%s/%s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); - - if((grp = alpm_pkg_get_groups(pkg)) != NULL) { - group = alpm_list_getdata(grp); - printf(" (%s)\n ", (char *)alpm_list_getdata(grp)); + if (!(config->flags & PM_TRANS_FLAG_BEQUIET)) { + printf("%s/%s %s", + alpm_db_get_name(db), + alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg)); } else { - printf("\n "); + printf("%s", alpm_pkg_get_name(pkg)); } + + if (!(config->flags & PM_TRANS_FLAG_BEQUIET)) { + if((grp = alpm_pkg_get_groups(pkg)) != NULL) { + group = alpm_list_getdata(grp); + printf(" (%s)\n ", (char *)alpm_list_getdata(grp)); + } else { + printf("\n "); + } - indentprint(alpm_pkg_get_desc(pkg), 4); + indentprint(alpm_pkg_get_desc(pkg), 4); + } printf("\n"); } alpm_list_free(ret);