RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 09-Dec-2007 18:55:09
Branch: rpm-4_5 Handle: 2007120917550900
Modified files: (Branch: rpm-4_5)
rpm rpmqv.c
Log:
make "rpm -bb --quiet" quiet as should be, otherwise this option is simply
ignored in rpmcliAllPoptTable)
(from pixel)
Summary:
Revision Changes Path
1.113.2.4 +8 -1 rpm/rpmqv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.113.2.3 -r1.113.2.4 rpmqv.c
--- rpm/rpmqv.c 9 Dec 2007 04:12:36 -0000 1.113.2.3
+++ rpm/rpmqv.c 9 Dec 2007 17:55:09 -0000 1.113.2.4
@@ -68,6 +68,8 @@
#define MODES_FOR_TEST (MODES_BT | MODES_IE)
#define MODES_FOR_ROOT (MODES_BT | MODES_IE | MODES_QV |
MODES_DB | MODES_K)
+static int quiet;
+
/* the structure describing the options we take and the defaults */
/[EMAIL PROTECTED]@*/
static struct poptOption optionsTable[] = {
@@ -122,6 +124,8 @@
NULL },
#endif /* IAM_RPMEIU */
+ { "quiet", '\0', 0, &quiet, 0, NULL, NULL},
+
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
N_("Common options for all rpm modes and executables:"),
NULL },
@@ -471,6 +475,9 @@
}
}
+ if (quiet)
+ rpmSetVerbosity(RPMMESS_QUIET);
+
#if defined(IAM_RPMBT) || defined(IAM_RPMK)
if (0
#if defined(IAM_RPMBT)
@@ -628,7 +635,7 @@
case MODE_BUILD:
case MODE_TARBUILD:
{ const char * pkg;
- while (!rpmIsVerbose())
+ if (!quiet) while (!rpmIsVerbose())
rpmIncreaseVerbosity();
switch (ba->buildChar) {
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
