RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm/ CHANGES rpm/build/ build.c

From: Ralf S. Engelschall <rse+rpm-devel@rpm5.org>
Date: Fri 21 Dec 2007 - 22:37:12 CET
Message-ID: <20071221213712.GA41540@engelschall.com>
On Fri, Dec 21, 2007, Jeff Johnson wrote:

>     - jbj: fix: permit -bt on specfiles w/o %track, remove an assertion.
>
>   Summary:
>     Revision    Changes     Path
>     1.2004      +1  -0      rpm/CHANGES
>     2.127       +0  -1      rpm/build/build.c
>   ____________________________________________________________________________
>
>   patch -p0 <<'@@ .'
>   Index: rpm/CHANGES
>   ============================================================================
>   $ cvs diff -u -r1.2003 -r1.2004 CHANGES
>   --- rpm/CHANGES 21 Dec 2007 08:51:45 -0000  1.2003
>   +++ rpm/CHANGES 21 Dec 2007 14:42:20 -0000  1.2004
>   @@ -1,4 +1,5 @@
>    5.0b2 -> 5.0b3:
>   +    - jbj: fix: permit -bt on specfiles w/o %track, remove an assertion.
>        - rse: fix paths to stringbuf.[ch]
>        - pixel: fix http://qa.mandriva.com/show_bug.cgi?id=27417.
>        - jbj: expedient fix for http://qa.mandriva.com/show_bug.cgi?id=31680.
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/build/build.c
>   ============================================================================
>   $ cvs diff -u -r2.126 -r2.127 build.c
>   --- rpm/build/build.c   18 Dec 2007 19:40:52 -0000  2.126
>   +++ rpm/build/build.c   21 Dec 2007 14:42:20 -0000  2.127
>   @@ -167,7 +167,6 @@
>           sb = spec->foo[i].val;
>           break;
>       }
>   -assert(sb != NULL);
>       mTemplate = "%{__spec_track_template}";
>       mPost = "%{__spec_track_post}";
>       mCmd = "%{__spec_track_cmd}";

BTW, the assertion now obviously is gone, but:

1. in my case the assertion fires *ALTHOUGH* I *HAD* %track!

2. the latest HEAD (after this change) now does *nothing* on "rpm -bt":

   $ /openpkg/bin/openpkg rpm -vv -bt make.spec
   $ _

   Even if I add an "echo 'TEST'" into my __spec_track_* macros I never
   see any 'TEST' in the output. It now looks as if the "-bt" no longer
   finds the %track section at all...

Ops?
                                       Ralf S. Engelschall
                                       rse@engelschall.com
                                       www.engelschall.com
Received on Fri Dec 21 22:40:41 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.