RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 31-Mar-2010 14:18:43
Branch: HEAD Handle: 2010033112184200
Modified files:
rpm CHANGES rpmqv.c
Log:
- fix: don't display usage with "rpm -v", it clutters --eval output.
Summary:
Revision Changes Path
1.3290 +1 -0 rpm/CHANGES
1.166 +4 -0 rpm/rpmqv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3289 -r1.3290 CHANGES
--- rpm/CHANGES 30 Mar 2010 13:27:38 -0000 1.3289
+++ rpm/CHANGES 31 Mar 2010 12:18:42 -0000 1.3290
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+ - jbj: fix: don't display usage with "rpm -v", it clutters --eval output.
- jbj: rpmdav: fix: rename url -> u using --without-neon. (John Thomson).
- jbj: nix: add --xiu:stdenv query format template.
- jbj: nix: add --nix:meta query format template.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.165 -r1.166 rpmqv.c
--- rpm/rpmqv.c 10 Feb 2010 20:24:49 -0000 1.165
+++ rpm/rpmqv.c 31 Mar 2010 12:18:42 -0000 1.166
@@ -172,6 +172,7 @@
rpmlibVersion(), rpmlibTimestamp(), rpmlibVendor());
}
+#ifdef DYING /* XXX rpmIsVerbose alone stops usage spewage with every
--eval */
static void printUsage(poptContext con, FILE * fp, int flags)
/*...@globals rpmEVR, fileSystem, internalState @*/
/*...@modifies *fp, fileSystem, internalState @*/
@@ -184,6 +185,7 @@
else
poptPrintUsage(con, fp, flags);
}
+#endif
#if defined(RPM_VENDOR_OPENPKG) /* integrity-checking */
@@ -1013,10 +1015,12 @@
case MODE_ERASE:
#endif
case MODE_UNKNOWN:
+#ifdef DYING /* XXX rpmIsVerbose alone stops usage spewage with every
--eval */
if (poptPeekArg(optCon) != NULL || argc <= 1 || rpmIsVerbose()) {
printUsage(optCon, stderr, 0);
ec = argc;
}
+#endif
break;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
