]> git.pld-linux.org Git - packages/rpm.git/commitdiff
- added helperEVR-noassert patch (replace assert by error message;
authorJakub Bogusz <qboosh@pld-linux.org>
Tue, 14 Feb 2012 18:19:57 +0000 (18:19 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
  or maybe the build should fail in such case? but not in such pailfully way)

Changed files:
    rpm-helperEVR-noassert.patch -> 1.1

rpm-helperEVR-noassert.patch [new file with mode: 0644]

diff --git a/rpm-helperEVR-noassert.patch b/rpm-helperEVR-noassert.patch
new file mode 100644 (file)
index 0000000..fff4a84
--- /dev/null
@@ -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@*/
This page took 0.081158 seconds and 4 git commands to generate.