Bug#702746: release.debian.org: pre-approval: libguestfs 1:1.18.1-1+deb7u2

[Hilko Bengen <bengen@debian.org>]

* Adam D. Barratt:

> tags 702746 + confirmed
> user release.debian.org@packages.debian.org
> usertags 702746 + unblock
> thanks
>
> On Mon, 2013-03-11 at 00:26 +0100, Hilko Bengen wrote:
>> I'd like to fix libguestfs bug #702624 (guestmount does not work) via
>> tpu.
>
> Please go ahead.

Thank you. I am uploading now.

I had to add another small patch to debian/patches that fixes an FTBFS
(test failure) on wheezy. I have attached that patch below.

Cheers,
-Hilko

commit 79aec9b58cfb15e02a2e028e97f450e18e702a5a
Author: Richard W.M. Jones <rjones@redhat.com>
Date:   Wed Jun 27 10:54:02 2012 +0100

    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.
    (cherry picked from commit 6afb7336e33dc28c4fd1a4545a8298ee36c10723)

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;
     }