Remove patch which is now upstream.
This commit is contained in:
parent
45f9b98026
commit
e09228e8e7
@ -1,32 +0,0 @@
|
|||||||
From 6afb7336e33dc28c4fd1a4545a8298ee36c10723 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
||||||
Date: Wed, 27 Jun 2012 10:54:02 +0100
|
|
||||||
Subject: [PATCH] gobject: bindtests: gjs exception behaviour changed, fix
|
|
||||||
test.
|
|
||||||
|
|
||||||
When libguestfs calls 'error (g, "error")', gjs in F17 throws
|
|
||||||
error.message == "Error invoking Guestfs.test0rinterr: error"
|
|
||||||
|
|
||||||
In F18, error.message is simply the string "error".
|
|
||||||
|
|
||||||
Fix the test so it works for both cases.
|
|
||||||
---
|
|
||||||
gobject/bindtests-manual.js | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/gobject/bindtests-manual.js b/gobject/bindtests-manual.js
|
|
||||||
index 84a1546..8f4ef15 100644
|
|
||||||
--- a/gobject/bindtests-manual.js
|
|
||||||
+++ b/gobject/bindtests-manual.js
|
|
||||||
@@ -26,7 +26,7 @@ function check_error(f) {
|
|
||||||
g[f]();
|
|
||||||
} catch (error) {
|
|
||||||
threw = true;
|
|
||||||
- if (!error.message.match(/: error$/)) {
|
|
||||||
+ if (!error.message.match(/error$/)) {
|
|
||||||
print(f + " threw unexpected error: " + error.message);
|
|
||||||
fail = true;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.7.10.2
|
|
||||||
|
|
@ -40,9 +40,6 @@ BuildRequires: autoconf, automake, libtool, gettext-devel
|
|||||||
# patch.
|
# patch.
|
||||||
Patch4: libguestfs-1.19.2-remove-udev-from-packagelist.patch
|
Patch4: libguestfs-1.19.2-remove-udev-from-packagelist.patch
|
||||||
|
|
||||||
# Upstream patch to fix GObject/Javascript tests.
|
|
||||||
Patch5: 0001-gobject-bindtests-gjs-exception-behaviour-changed-fi.patch
|
|
||||||
|
|
||||||
%if 0%{?rhel} >= 7
|
%if 0%{?rhel} >= 7
|
||||||
ExclusiveArch: x86_64
|
ExclusiveArch: x86_64
|
||||||
%endif
|
%endif
|
||||||
@ -686,7 +683,6 @@ autoreconf -i
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
|
||||||
|
|
||||||
mkdir -p daemon/m4
|
mkdir -p daemon/m4
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user