RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 14-Oct-2007 17:24:49
Branch: HEAD Handle: 2007101416244801
Modified files:
rpm CHANGES
rpm/lib depends.c
Log:
- jbj: fix: grr, headerGetEntry return code is backwards.
Summary:
Revision Changes Path
1.1695 +1 -0 rpm/CHANGES
1.347 +1 -1 rpm/lib/depends.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1694 -r1.1695 CHANGES
--- rpm/CHANGES 14 Oct 2007 15:15:14 -0000 1.1694
+++ rpm/CHANGES 14 Oct 2007 15:24:48 -0000 1.1695
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: fx: grr, headerGetEntry return code is backwards.
- jbj: clean up some warnings.
- jbj: change HGE_t prototype to see what remains to be fixed.
- jbj: rpmsignature.c: use headerGetExtension everywhere.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.346 -r1.347 depends.c
--- rpm/lib/depends.c 13 Oct 2007 20:42:06 -0000 1.346
+++ rpm/lib/depends.c 14 Oct 2007 15:24:49 -0000 1.347
@@ -1338,7 +1338,7 @@
he->tag = RPMTAG_NVRA;
rc = hge(h, he->tag, he->t, he->p, he->c);
-assert(rc && he_p.str != NULL);
+assert(he_p.str != NULL);
if (!(depFlags & RPMDEPS_FLAG_NOREQUIRES))
requires = rpmdsNew(h, RPMTAG_REQUIRENAME, scareMem);
if (!(depFlags & RPMDEPS_FLAG_NOCONFLICTS))
@@ .
Received on Sun Oct 14 17:24:49 2007