- ported to 4.4.9

[packages/rpm.git] / rpm-gettext-in-header.patch

diff --git a/rpm-gettext-in-header.patch b/rpm-gettext-in-header.patch
index 0e2a11e89cd2052b21d13d6dadb7d6fafb6a8ac4..9e3ff96810310789337e83ee82f1ad0f42c3a389 100644 (file)
--- a/rpm-gettext-in-header.patch
+++ b/rpm-gettext-in-header.patch
@@ -1,13 +1,12 @@
---- ./lib/header.c.org Sun Feb 17 01:50:51 2002
-+++ ./lib/header.c     Sun Feb 17 01:52:01 2002
-@@ -1282,8 +1282,8 @@
- 
-       }
+--- rpm-4.1/rpmdb/header.c.wiget2      Thu Sep 19 00:47:29 2002
++++ rpm-4.1/rpmdb/header.c     Thu Sep 19 00:52:10 2002
+@@ -1645,7 +1645,8 @@
      }
--
+ /*@=boundsread@*/
+ 
 -    return entry->data;
 +/* when everything fail, try gettext */
-+    return _(entry->data);
++    return ((entry->data != NULL) && *(char*)(entry->data)) ? _(entry->data) : entry->data;
  }
  
  /**