RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 11-Apr-2016 23:57:37
Branch: rpm-5_4 Handle: 2016041121573700
Modified files: (Branch: rpm-5_4)
rpm/rpmdb hdrNVR.c
Log:
- headerMergeLegacySigs: back out too strict assertions, rely on
filtering.
Summary:
Revision Changes Path
1.46.6.8 +0 -7 rpm/rpmdb/hdrNVR.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
============================================================================
$ cvs diff -u -r1.46.6.7 -r1.46.6.8 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c 10 Apr 2016 22:03:54 -0000 1.46.6.7
+++ rpm/rpmdb/hdrNVR.c 11 Apr 2016 21:57:37 -0000 1.46.6.8
@@ -261,15 +261,12 @@
break;
}
if (!headerIsEntry(h, he->tag)) {
-#ifdef DYING
if (hdrchkType(he->t))
continue;
if (hdrchkData(he->c))
continue;
-#endif
switch(he->t) {
default:
-assert(0);
rpmlog(RPMLOG_ERR,
_("%s: skipping tag: tag(%u) t(%u) data %p[%u]\n"),
__FUNCTION__, xx, he->tag, he->t, he->p.ptr, he->c);
@@ -279,23 +276,19 @@
case RPM_UINT16_TYPE:
case RPM_UINT32_TYPE:
case RPM_UINT64_TYPE:
-assert(he->c == 1);
if (he->c != 1)
continue;
break;
case RPM_STRING_TYPE:
-assert(he->c == 1);
if (he->c != 1)
continue;
break;
case RPM_BIN_TYPE:
-assert(he->c < 16*1024);
if (he->c >= 16*1024)
continue;
break;
case RPM_I18NSTRING_TYPE:
case RPM_STRING_ARRAY_TYPE:
-assert(0);
continue;
break;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
