RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  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:
    Revision    Changes     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 -0000	1.113.2.2
  +++ rpm/rpmqv.c	9 Dec 2007 04:12:36 -0000	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)
   		/*@innerbreak@*/ break;
   	    /*@fallthrough@*/
   	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)
   		/*@innerbreak@*/ break;
   	    /*@fallthrough@*/
   	case 'c':
   	    ba->buildAmount |= RPMBUILD_BUILD;
  -	    if ((ba->buildChar == 'c') && ba->shortCircuit)
  +	    if (
  +#if !defined(RPM_VENDOR_MANDRIVA)
  + 		(ba->buildChar == 'c') &&
  +#endif
  +		ba->shortCircuit)
   		/*@innerbreak@*/ break;
   	    /*@fallthrough@*/
   	case 'p':
  @@ .