RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 05-Apr-2011 23:36:01
Branch: rpm-5_3 Handle: 2011040521360000
Modified files: (Branch: rpm-5_3)
rpm/build parseDescription.c
Log:
don't delete the inherited %description (mdvbz#62979)
uncertain about the correct behaviour here, I assume that what is supposed
to
happen is that missing %description for a sub-package should result in no
%description (thus an error), which doesn't seem to be the actual behaviour.
The type returned by headerGet() is not what is expected either..
Placing under a mandriva #ifdef for now...
Summary:
Revision Changes Path
2.44.2.1 +2 -0 rpm/build/parseDescription.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/build/parseDescription.c
============================================================================
$ cvs diff -u -r2.44 -r2.44.2.1 parseDescription.c
--- rpm/build/parseDescription.c 16 Feb 2010 15:12:21 -0000 2.44
+++ rpm/build/parseDescription.c 5 Apr 2011 21:36:00 -0000 2.44.2.1
@@ -90,6 +90,7 @@
}
/* Lose the inheirited %description (if present). */
+#if !defined(RPM_VENDOR_MANDRIVA) /* mdvbz#62979 */
{ HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int xx;
he->tag = RPMTAG_DESCRIPTION;
@@ -98,6 +99,7 @@
if (xx && he->t == RPM_STRING_TYPE)
xx = headerDel(pkg->header, he, 0);
}
+#endif
t = stashSt(spec, pkg->header, RPMTAG_DESCRIPTION, lang);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
