[CVS] RPM: rpm-4_5: rpm/ rpmqv.c
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:
RevisionChanges 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 - 1.113.2.3
+++ rpm/rpmqv.c 9 Dec 2007 17:55:09 - 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 Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-4_5: rpm/ rpmqv.c
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 05:12:36 Branch: rpm-4_5 Handle: 2007120904123600 Modified files: (Branch: rpm-4_5) rpm rpmqv.c Log: allow --short-circuit -bb & -ba in Mandriva (http://qa.mandriva.com/show_bug.cgi?id=15896) Summary: RevisionChanges Path 1.113.2.3 +15 -3 rpm/rpmqv.c patch -p0 <<'@@ .' Index: rpm/rpmqv.c $ cvs diff -u -r1.113.2.2 -r1.113.2.3 rpmqv.c --- rpm/rpmqv.c 30 Jul 2007 03:07:58 - 1.113.2.2 +++ rpm/rpmqv.c 9 Dec 2007 04:12:36 - 1.113.2.3 @@ -638,18 +638,30 @@ case 'b': ba->buildAmount |= RPMBUILD_PACKAGEBINARY; ba->buildAmount |= RPMBUILD_CLEAN; - if ((ba->buildChar == 'b') && ba->shortCircuit) + if ( +#if !defined(RPM_VENDOR_MANDRIVA) + (ba->buildChar == 'b') && +#endif + ba->shortCircuit) /[EMAIL PROTECTED]@*/ break; /[EMAIL PROTECTED]@*/ case 'i': ba->buildAmount |= RPMBUILD_INSTALL; ba->buildAmount |= RPMBUILD_CHECK; - if ((ba->buildChar == 'i') && ba->shortCircuit) + if ( +#if !defined(RPM_VENDOR_MANDRIVA) + (ba->buildChar == 'i') && +#endif + ba->shortCircuit) /[EMAIL PROTECTED]@*/ break; /[EMAIL PROTECTED]@*/ case 'c': ba->buildAmount |= RPMBUILD_BUILD; - if ((ba->buildChar == 'c') && ba->shortCircuit) + if ( +#if !defined(RPM_VENDOR_MANDRIVA) + (ba->buildChar == 'c') && +#endif + ba->shortCircuit) /[EMAIL PROTECTED]@*/ break; /[EMAIL PROTECTED]@*/ case 'p': @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-4_5: rpm/ rpmqv.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Mark Hatle Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 06-Jun-2007 00:48:08 Branch: rpm-4_5 Handle: 2007060523480800 Modified files: (Branch: rpm-4_5) rpm rpmqv.c Log: Allow -bb --short-circuit. This patch comes from PLD Linux. Obtained from: PLD Linux Summary: RevisionChanges Path 1.113.2.1 +2 -0 rpm/rpmqv.c patch -p0 <<'@@ .' Index: rpm/rpmqv.c $ cvs diff -u -r1.113 -r1.113.2.1 rpmqv.c --- rpm/rpmqv.c 25 May 2007 17:35:52 - 1.113 +++ rpm/rpmqv.c 5 Jun 2007 22:48:08 - 1.113.2.1 @@ -644,6 +644,8 @@ case 'b': ba->buildAmount |= RPMBUILD_PACKAGEBINARY; ba->buildAmount |= RPMBUILD_CLEAN; + if ((ba->buildChar == 'b') && ba->shortCircuit) + /[EMAIL PROTECTED]@*/ break; /[EMAIL PROTECTED]@*/ case 'i': ba->buildAmount |= RPMBUILD_INSTALL; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
