RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Mar-2008 08:17:35
Branch: HEAD Handle: 2008030207173401
Modified files:
rpm CHANGES
rpm/lib verify.c
Log:
- jbj: verify.c: use rpmProblemGetAltNEVR() to make rpmProblem opaque.
Summary:
Revision Changes Path
1.2217 +1 -0 rpm/CHANGES
2.185 +7 -7 rpm/lib/verify.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2216 -r1.2217 CHANGES
--- rpm/CHANGES 2 Mar 2008 06:37:40 -0000 1.2216
+++ rpm/CHANGES 2 Mar 2008 07:17:34 -0000 1.2217
@@ -1,4 +1,5 @@
5.0.0 -> 5.1a1:
+ - jbj: verify.c: use rpmProblemGetAltNEVR() to make rpmProblem opaque.
- jbj: fsm: use rpmfi iterators in several loops.
- jbj: rpmfi: add rpmfiSetHeader() so verify.c doesn't need
_RPMFI_INTERNAL.
- jbj: rpmdav: refactor davOpendir et al on top of avOpendir.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/verify.c
============================================================================
$ cvs diff -u -r2.184 -r2.185 verify.c
--- rpm/lib/verify.c 2 Mar 2008 06:37:41 -0000 2.184
+++ rpm/lib/verify.c 2 Mar 2008 07:17:35 -0000 2.185
@@ -17,7 +17,6 @@
#include "debug.h"
/[EMAIL PROTECTED] rpmpsm @*/ /* XXX for %verifyscript through
rpmpsmStage() */
-/[EMAIL PROTECTED] rpmProblem @*/
#define S_ISDEV(m) (S_ISBLK((m)) || S_ISCHR((m)))
@@ -409,17 +408,17 @@
const char * altNEVR;
const char * pkgNEVR = NULL;
rpmpsi psi;
- rpmProblem p;
+ rpmProblem prob;
char * t, * te;
int nb = 512;
psi = rpmpsInitIterator(ps);
while (rpmpsNextIterator(psi) >= 0) {
- p = rpmpsProblem(psi);
+ prob = rpmpsProblem(psi);
if (pkgNEVR == NULL)
- pkgNEVR = rpmProblemGetPkgNEVR(p);
+ pkgNEVR = rpmProblemGetPkgNEVR(prob);
- altNEVR = rpmProblemGetAltNEVR(p);
+ altNEVR = rpmProblemGetAltNEVR(prob);
if (altNEVR[0] == 'R' && altNEVR[1] == ' ')
nb += sizeof("\tRequires: ")-1;
if (altNEVR[0] == 'C' && altNEVR[1] == ' ')
@@ -436,9 +435,10 @@
psi = rpmpsInitIterator(ps);
while (rpmpsNextIterator(psi) >= 0) {
- p = rpmpsProblem(psi);
+ prob = rpmpsProblem(psi);
- altNEVR = (p->altNEVR ? p->altNEVR : "? ?altNEVR?");
+ if ((altNEVR = rpmProblemGetAltNEVR(prob)) == NULL)
+ altNEVR = "? ?altNEVR?";
if (altNEVR[0] == 'R' && altNEVR[1] == ' ')
te = stpcpy(te, "\tRequires: ");
if (altNEVR[0] == 'C' && altNEVR[1] == ' ')
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
