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:
Revision Changes 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 -0000 1.1386
+++ rpm/CHANGES 21 Jun 2007 15:55:29 -0000 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 -0000 1.113
+++ rpm/rpmqv.c 21 Jun 2007 15:55:29 -0000 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 Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
