summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2007-11-13 13:09:01 +0200
committerPanu Matilainen <pmatilai@redhat.com>2007-11-13 13:09:01 +0200
commitb6a1ee9bb75b3f11bbab035137f37ccfd0db1cc3 (patch)
treeae0c807b32ea6eaccc05cf5746f342299799fab2
parentb3591654458361becb2db7c36594469b89a3bf6a (diff)
downloadlibrpm-tizen-b6a1ee9bb75b3f11bbab035137f37ccfd0db1cc3.tar.gz
librpm-tizen-b6a1ee9bb75b3f11bbab035137f37ccfd0db1cc3.tar.bz2
librpm-tizen-b6a1ee9bb75b3f11bbab035137f37ccfd0db1cc3.zip
Make "rpmbuild -bb --quiet" quiet as should be
(without this patch, the option is simply ignored in rpmcliAllPoptTable) Also rhbz#124300 Patch from Pascal Rigaux
-rw-r--r--rpmqv.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/rpmqv.c b/rpmqv.c
index 09ca98642..31081587d 100644
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -65,6 +65,8 @@ enum modes {
#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 */
static struct poptOption optionsTable[] = {
@@ -109,6 +111,8 @@ static struct poptOption optionsTable[] = {
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 },
@@ -494,6 +498,9 @@ int main(int argc, char *argv[])
}
}
+ if (quiet)
+ rpmSetVerbosity(RPMLOG_WARNING);
+
#if defined(IAM_RPMBT) || defined(IAM_RPMK)
if (0
#if defined(IAM_RPMBT)
@@ -649,7 +656,7 @@ int main(int argc, char *argv[])
case MODE_BUILD:
case MODE_TARBUILD:
{ const char * pkg;
- while (!rpmIsVerbose())
+ if (!quiet) while (!rpmIsVerbose())
rpmIncreaseVerbosity();
switch (ba->buildChar) {