diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-08-20 11:16:17 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-08-20 11:16:17 +0300 |
| commit | 5ddfae716aeac7349485ecef3289d20071071dd5 (patch) | |
| tree | eda8ca61b56e2b99d763a0eb7c1427a89b0c9ef7 /rpmbuild.c | |
| parent | 7230aba539a61d07dd6398e981db4541ea4c8540 (diff) | |
| download | rpm-5ddfae716aeac7349485ecef3289d20071071dd5.tar.gz rpm-5ddfae716aeac7349485ecef3289d20071071dd5.tar.bz2 rpm-5ddfae716aeac7349485ecef3289d20071071dd5.zip | |
Clean up rpmbuild's --quiet handling + honor it on --rebuild too
Diffstat (limited to 'rpmbuild.c')
| -rw-r--r-- | rpmbuild.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/rpmbuild.c b/rpmbuild.c index 37c8089bb..a9ccc2bc5 100644 --- a/rpmbuild.c +++ b/rpmbuild.c @@ -168,9 +168,6 @@ int main(int argc, char *argv[]) argerror(_("arguments to --root (-r) must begin with a /")); } - if (quiet) - rpmSetVerbosity(RPMLOG_WARNING); - if (ba->sign) { int sigTag = rpmLookupSignatureType(RPMLOOKUPSIG_QUERY); switch (sigTag) { @@ -200,6 +197,9 @@ int main(int argc, char *argv[]) (void) rpmLookupSignatureType(RPMLOOKUPSIG_DISABLE); } + /* rpmbuild is rather chatty by default */ + rpmSetVerbosity(quiet ? RPMLOG_WARNING : RPMLOG_INFO); + if (rpmcliPipeOutput) { if (pipe(p) < 0) { fprintf(stderr, _("creating a pipe for --pipe failed: %m\n")); @@ -225,9 +225,6 @@ int main(int argc, char *argv[]) switch (bigMode) { case MODE_REBUILD: case MODE_RECOMPILE: - while (!rpmIsVerbose()) - rpmIncreaseVerbosity(); - ba->buildAmount = RPMBUILD_PREP | RPMBUILD_BUILD | RPMBUILD_INSTALL | RPMBUILD_CHECK; if (bigMode == MODE_REBUILD) { @@ -257,9 +254,6 @@ int main(int argc, char *argv[]) break; case MODE_BUILD: case MODE_TARBUILD: - if (!quiet) while (!rpmIsVerbose()) - rpmIncreaseVerbosity(); - switch (ba->buildChar) { case 'a': ba->buildAmount |= RPMBUILD_PACKAGESOURCE; |