Author: qboosh Date: Tue Feb 14 18:20:03 2012 GMT
Module: packages Tag: rpm-4_5
---- Log message:
- added helperEVR-noassert patch (replace assert by error message;
or maybe the build should fail in such case? but not in such pailfully way)
---- Files affected:
packages/rpm:
rpm.spec (1.837.2.42.2.49.2.117 -> 1.837.2.42.2.49.2.118) ,
rpm-helperEVR-noassert.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.117
packages/rpm/rpm.spec:1.837.2.42.2.49.2.118
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.117 Mon Jan 30 17:54:29 2012
+++ packages/rpm/rpm.spec Tue Feb 14 19:19:57 2012
@@ -58,7 +58,7 @@
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.5
-Release: 61
+Release: 62
License: LGPL
Group: Base
Source0: %{name}-%{version}.tar.gz
@@ -127,6 +127,7 @@
Patch36: %{name}-debuginfo.patch
Patch37: %{name}-doxygen_hack.patch
Patch39: %{name}-popt-coreutils.patch
+Patch40: %{name}-helperEVR-noassert.patch
Patch42: %{name}-old-fileconflicts-behaviour.patch
Patch43: %{name}-rpm5-patchset-8637.patch
Patch44: %{name}-no-neon.patch
@@ -751,6 +752,7 @@
%patch36 -p1
%patch37 -p1
%patch39 -p1
+%patch40 -p1
%patch42 -p1
%patch43 -p1
%patch82 -p1
@@ -1493,6 +1495,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.837.2.42.2.49.2.118 2012/02/14 18:19:57 qboosh
+- added helperEVR-noassert patch (replace assert by error message;
+ or maybe the build should fail in such case? but not in such pailfully way)
+
Revision 1.837.2.42.2.49.2.117 2012/01/30 16:54:29 baggins
- rel 61
- added __spec_install_post_check_tmpfiles
================================================================
Index: packages/rpm/rpm-helperEVR-noassert.patch
diff -u /dev/null packages/rpm/rpm-helperEVR-noassert.patch:1.1
--- /dev/null Tue Feb 14 19:20:03 2012
+++ packages/rpm/rpm-helperEVR-noassert.patch Tue Feb 14 19:19:57 2012
@@ -0,0 +1,14 @@
+--- rpm-4.5/lib/rpmfc.c.orig 2012-02-13 20:28:52.564758176 +0100
++++ rpm-4.5/lib/rpmfc.c 2012-02-14 19:01:50.810809655 +0100
+@@ -472,7 +472,10 @@
+ }
+ i++;
+ EVR = pav[i];
+-assert(EVR != NULL);
++ if(EVR == NULL) {
++ rpmMessage(RPMMESS_ERROR, _("%s helper returned empty
version info for %s, omitting\n"), nsdep, N);
++ continue;
++ }
+ }
+ /*@=branchstate@*/
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.117&r2=1.837.2.42.2.49.2.118&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
