RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 30-Mar-2011 16:25:39
Branch: rpm-5_4 Handle: 2011033014253900
Modified files: (Branch: rpm-5_4)
rpm rpmqv.c
Log:
place 'rpm -ba' short-circuitting under mandriva #ifdef
Summary:
Revision Changes Path
1.167.4.4 +4 -0 rpm/rpmqv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.167.4.3 -r1.167.4.4 rpmqv.c
--- rpm/rpmqv.c 27 Mar 2011 21:55:54 -0000 1.167.4.3
+++ rpm/rpmqv.c 30 Mar 2011 14:25:39 -0000 1.167.4.4
@@ -822,7 +822,11 @@
case 'b':
ba->buildAmount |= RPMBUILD_PACKAGEBINARY;
ba->buildAmount |= RPMBUILD_CLEAN;
+#if defined(RPM_VENDOR_MANDRIVA)
+ if ((ba->buildChar == 'a' || ba->buildChar == 'b') &&
ba->shortCircuit)
+#else
if ((ba->buildChar == 'b') && ba->shortCircuit)
+#endif
/*@innerbreak@*/ break;
/*@fallthrough@*/
case 'i':
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
