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: 27-May-2009 20:14:38
Branch: HEAD Handle: 2009052718143800
Modified files:
rpm CHANGES
rpm/rpmdb header.c
Log:
- remove first (of 3) rpm-5.2.0 release process be-bugging flaws.
Summary:
Revision Changes Path
1.2999 +1 -0 rpm/CHANGES
1.191 +5 -2 rpm/rpmdb/header.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2998 -r1.2999 CHANGES
--- rpm/CHANGES 25 May 2009 16:48:21 -0000 1.2998
+++ rpm/CHANGES 27 May 2009 18:14:38 -0000 1.2999
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+ - jbj: remove first (of 3) rpm-5.2.0 release process be-bugging flaws.
- jbj: fix: resuscitate --nodigest/--nosignature w --rebuilddb.
- jbj: pick-up some orphan check-ins.
- jbj: header: remove (unused) headerUsageCount.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.190 -r1.191 header.c
--- rpm/rpmdb/header.c 24 May 2009 22:48:44 -0000 1.190
+++ rpm/rpmdb/header.c 27 May 2009 18:14:38 -0000 1.191
@@ -181,7 +181,7 @@
memset(&h->h_getops, 0, sizeof(h->h_getops));
h->indexAlloced = INDEX_MALLOC_SIZE;
h->indexUsed = 0;
- h->flags |= HEADERFLAG_SORTED;
+ h->flags = HEADERFLAG_SORTED;
h->index = (h->indexAlloced
? xcalloc(h->indexAlloced, sizeof(*h->index))
@@ -990,7 +990,7 @@
h->indexAlloced = il + 1;
h->indexUsed = il;
h->index = xcalloc(h->indexAlloced, sizeof(*h->index));
- h->flags |= HEADERFLAG_SORTED;
+ h->flags = HEADERFLAG_SORTED;
h = headerLink(h);
assert(h != NULL);
@@ -1280,6 +1280,7 @@
uh = _free(uh);
return NULL;
}
+ nh->flags &= ~(HEADERFLAG_MAPPED|HEADERFLAG_RDONLY); /* XXX unnecessary
*/
nh->flags |= HEADERFLAG_ALLOCATED;
if (ENTRY_IS_REGION(nh->index)) {
if (tag == HEADER_SIGNATURES || tag == HEADER_IMMUTABLE)
@@ -1302,6 +1303,8 @@
/*...@=assignexpose@*/
(void) headerSetRpmdb(nh, rpmdb);
xx = (int) headerSetInstance(nh, instance);
+if (_hdr_debug)
+fprintf(stderr, "--> h %p ==== %s: blob %p[%u] flags 0x%x\n", nh,
__FUNCTION__, nh->blob, nh->bloblen, nh->flags);
return nh;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
