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: 27-Mar-2011 22:43:52
Branch: rpm-5_3 Handle: 2011032720435101
Modified files: (Branch: rpm-5_3)
rpm CHANGES rpmqv.c
Log:
make 'rpm -ba' short-circuitable
Summary:
Revision Changes Path
1.3296.2.181+1 -0 rpm/CHANGES
1.167.2.2 +1 -1 rpm/rpmqv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.180 -r1.3296.2.181 CHANGES
--- rpm/CHANGES 27 Mar 2011 05:15:11 -0000 1.3296.2.180
+++ rpm/CHANGES 27 Mar 2011 20:43:51 -0000 1.3296.2.181
@@ -1,4 +1,5 @@
5.3.9 -> 5.3.10
+ - proyvind: make 'rpm -ba' short-circuitable.
- jbj: fix: reduce false positives checking for duplicate keys (#62822).
- jbj: uuid: permit --qf '%{RPMTAG:uuid}' UUIDv1/UUIDv5 output display.
- jbj: uuid: rework for single exit return.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.167.2.1 -r1.167.2.2 rpmqv.c
--- rpm/rpmqv.c 19 Mar 2011 17:11:14 -0000 1.167.2.1
+++ rpm/rpmqv.c 27 Mar 2011 20:43:52 -0000 1.167.2.2
@@ -822,7 +822,7 @@
case 'b':
ba->buildAmount |= RPMBUILD_PACKAGEBINARY;
ba->buildAmount |= RPMBUILD_CLEAN;
- if ((ba->buildChar == 'b') && ba->shortCircuit)
+ if ((ba->buildChar == 'a' || ba->buildChar == 'b') &&
ba->shortCircuit)
/*@innerbreak@*/ break;
/*@fallthrough@*/
case 'i':
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
