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: 04-Feb-2008 00:47:49
Branch: rpm-5_0 Handle: 2008020323474900
Modified files: (Branch: rpm-5_0)
rpm CHANGES
rpm/rpmdb header.c rpmtag.h
Log:
- fix: poldek in PLD needs replacement for headerGetRawEntry().
Summary:
Revision Changes Path
1.2054.2.33 +1 -0 rpm/CHANGES
1.146.2.1 +7 -3 rpm/rpmdb/header.c
1.34.2.1 +1 -0 rpm/rpmdb/rpmtag.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2054.2.32 -r1.2054.2.33 CHANGES
--- rpm/CHANGES 1 Feb 2008 07:58:39 -0000 1.2054.2.32
+++ rpm/CHANGES 3 Feb 2008 23:47:49 -0000 1.2054.2.33
@@ -1,4 +1,5 @@
5.0.1 -> 5.0.2:
+ - jbj: fix: poldek in PLD needs replacement for headerGetRawEntry().
- rse: ensure macro option parsing is done correctly also under GLIBC by
not allowing option/argument permutations
- jbj: pedantic identification of Foo (not foo) syscalls in --fsmdebug
spew.
- jbj: fix: --rollback PSM_INIT changes added fstates before initialize.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.146 -r1.146.2.1 header.c
--- rpm/rpmdb/header.c 16 Dec 2007 23:21:23 -0000 1.146
+++ rpm/rpmdb/header.c 3 Feb 2008 23:47:49 -0000 1.146.2.1
@@ -1433,12 +1433,13 @@
* Retrieve tag data from header.
* @param h header
* @param he tag container
- * @param minMem string pointers reference header memory?
+ * @param flags headerGet flags
* @return 1 on success, 0 on not found
*/
-static int intGetEntry(Header h, HE_t he, int minMem)
+static int intGetEntry(Header h, HE_t he, int flags)
/[EMAIL PROTECTED] he @*/
{
+ int minMem = 0;
indexEntry entry;
int rc;
@@ -1455,6 +1456,7 @@
switch (entry->info.type) {
case RPM_I18NSTRING_TYPE:
+ if (!(flags & HEADERGET_NOI18NSTRING)) {
rc = 1;
he->t = RPM_STRING_TYPE;
he->c = 1;
@@ -1462,6 +1464,8 @@
he->p.str = headerFindI18NString(h, entry);
/[EMAIL PROTECTED]@*/
break;
+ }
+ /[EMAIL PROTECTED]@*/
default:
rc = copyEntry(entry, he, minMem);
break;
@@ -2032,7 +2036,7 @@
rc = ext->u.tagFunction(h, he);
rc = (rc == 0); /* XXX invert extension return. */
} else
- rc = intGetEntry(h, he, 0);
+ rc = intGetEntry(h, he, flags);
if (rc)
rc = rpmheRealloc(he);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtag.h
============================================================================
$ cvs diff -u -r1.34 -r1.34.2.1 rpmtag.h
--- rpm/rpmdb/rpmtag.h 28 Dec 2007 10:05:56 -0000 1.34
+++ rpm/rpmdb/rpmtag.h 3 Feb 2008 23:47:49 -0000 1.34.2.1
@@ -722,6 +722,7 @@
int headerGet(Header h, HE_t he, unsigned int flags)
/[EMAIL PROTECTED] he @*/;
#define HEADERGET_NOEXTENSION (1 << 0) /*!< Extension search
disabler. */
+#define HEADERGET_NOI18NSTRING (1 << 1) /*!< Return i18n strings as
argv. */
/** \ingroup header
* Add or append tag container to header.
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
