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: 18-Nov-2007 16:29:31
Branch: HEAD Handle: 2007111815293000
Modified files:
rpm CHANGES
rpm/rpmdb rpmdb.c
Log:
- fix: don't loop on failed lookup by instance.
Summary:
Revision Changes Path
1.1841 +1 -0 rpm/CHANGES
1.212 +5 -1 rpm/rpmdb/rpmdb.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1840 -r1.1841 CHANGES
--- rpm/CHANGES 17 Nov 2007 18:11:45 -0000 1.1840
+++ rpm/CHANGES 18 Nov 2007 15:29:30 -0000 1.1841
@@ -1,4 +1,5 @@
5.0a1 -> 5.0a2:
+ - jbj: fix: don't loop on failed lookup by instance.
- jbj: Eliminate SUPPORT_RPMV3_PROVIDE_SELF Provies: N = E:V-R retrofit.
- jbj: Eliminate SUPPORT_RPMV3_BASENAMES_HACKS file path conversions.
- jbj: Eliminate SUPPORT_RPMV3_VERIFY_{RSA,DSA} header+payload
signatures.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.211 -r1.212 rpmdb.c
--- rpm/rpmdb/rpmdb.c 17 Nov 2007 18:05:22 -0000 1.211
+++ rpm/rpmdb/rpmdb.c 18 Nov 2007 15:29:30 -0000 1.212
@@ -2457,8 +2457,12 @@
}
/* Skip damaged and inconsistent headers. */
- if (rpmrc == RPMRC_FAIL)
+ if (rpmrc == RPMRC_FAIL) {
+ /* XXX Terminate immediately on failed lookup by instance. */
+ if (mi->mi_set == NULL && mi->mi_keyp != NULL && mi->mi_keylen
== 4)
+ return NULL;
goto top;
+ }
}
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
