This patch (and devzero's change) make no sense. rpm -ba is _ALWAYS_ in short-cicuit mode by definition, because the starting point for --short-circuit is a non-existent directory and nothing is built.
The --short-circuit is to resume a build from a partially built tree at a given point and run to completion. Dare I ask? WTF do you want --short-circuit with -ba?!? Because some script has decided to _ALWAYS_ add --short-circuit? That's stoopid ... Please revert. 73 de Jeff On Mar 27, 2011, at 4:41 PM, Per Øyvind Karlsen wrote: > 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:41:23 > Branch: HEAD Handle: 2011032720412300 > > Modified files: > rpm CHANGES rpmqv.c > > Log: > make 'rpm -ba' short-circuitable > > Summary: > Revision Changes Path > 1.3580 +1 -0 rpm/CHANGES > 1.169 +1 -1 rpm/rpmqv.c > ____________________________________________________________________________ > > patch -p0 <<'@@ .' > Index: rpm/CHANGES > ============================================================================ > $ cvs diff -u -r1.3579 -r1.3580 CHANGES > --- rpm/CHANGES 27 Mar 2011 05:16:43 -0000 1.3579 > +++ rpm/CHANGES 27 Mar 2011 20:41:23 -0000 1.3580 > @@ -1,4 +1,5 @@ > 5.4.0 -> 5.4.1: > + - 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.168 -r1.169 rpmqv.c > --- rpm/rpmqv.c 19 Mar 2011 14:51:51 -0000 1.168 > +++ rpm/rpmqv.c 27 Mar 2011 20:41:23 -0000 1.169 > @@ -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-...@rpm5.org ______________________________________________________________________ RPM Package Manager http://rpm5.org Developer Communication List rpm-devel@rpm5.org