[CVS] RPM: rpm/ CHANGES rpmqv.c

2010-03-31 Thread Jeff Johnson 
  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:
RevisionChanges 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 -  1.3289
  +++ rpm/CHANGES   31 Mar 2010 12:18:42 -  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 -  1.165
  +++ rpm/rpmqv.c   31 Mar 2010 12:18:42 -  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 Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpmqv.c

2007-06-21 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   21-Jun-2007 17:55:29
  Branch: HEAD Handle: 2007062116552900

  Modified files:
rpm CHANGES rpmqv.c

  Log:
merge from rpm-4_5: allow -bb --short-circuit

  Summary:
RevisionChanges Path
1.1387  +1  -0  rpm/CHANGES
1.114   +2  -0  rpm/rpmqv.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1386 -r1.1387 CHANGES
  --- rpm/CHANGES   21 Jun 2007 13:53:44 -  1.1386
  +++ rpm/CHANGES   21 Jun 2007 15:55:29 -  1.1387
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- fray: allow -bb --short-circuit
   - rse: allow leading whitespaces on %setup and %patch lines in *.spec 
files
   - rse: resolve portability issue related to double definition of 
mergesort(3)
   - rse: fix building under UnixWare (blind port)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmqv.c
  
  $ cvs diff -u -r1.113 -r1.114 rpmqv.c
  --- rpm/rpmqv.c   25 May 2007 17:35:52 -  1.113
  +++ rpm/rpmqv.c   21 Jun 2007 15:55:29 -  1.114
  @@ -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