[Pkg-libvirt-commits] [virt-manager] 01/01: Fix spice availability detection

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1%1.3.2-2
in repository virt-manager.

commit 1b3b6f9dcf9a0a9ba159a13449f3b808190c6bda
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Mar 29 08:15:37 2016 +0200

    Fix spice availability detection
    
    gi.require_version('SpiceClientGtk', '3.0') raises ValueError if
    SpiceClientGtk is not installed so we never see ImportError. Check for
    both in case the module is there but the symbol went missing.
    
    Closes: #799771
---
 debian/changelog                                  | 12 ++++++++++++
 debian/patches/Make-SpiceClientGtk-optional.patch |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f6f224d..6531b6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+virt-manager (1:1.3.2-2) unstable; urgency=medium
+
+  * Upload to unstable
+  * [8a27ee8] Fix spice availability detection
+    gi.require_version('SpiceClientGtk', '3.0') raises ValueError if
+    SpiceClientGtk is not installed so we never see ImportError. Check for
+    both in case the module is there but the symbol went missing.
+    Thanks: Adel Belhouane for the patch
+    (Closes: #799771)
+
+ -- Guido Günther <agx at sigxcpu.org>  Tue, 29 Mar 2016 08:18:25 +0200
+
 virt-manager (1:1.3.2-1) experimental; urgency=medium
 
   * [74c0cce] Move python-ipaddr dependency from virt-manager to virtinst
diff --git a/debian/patches/Make-SpiceClientGtk-optional.patch b/debian/patches/Make-SpiceClientGtk-optional.patch
index b1d92e9..18a1c38 100644
--- a/debian/patches/Make-SpiceClientGtk-optional.patch
+++ b/debian/patches/Make-SpiceClientGtk-optional.patch
@@ -51,7 +51,7 @@ index b424e90..b9c7512 100644
 +    from gi.repository import SpiceClientGtk
 +    from gi.repository import SpiceClientGLib
 +    have_spice_gtk = True
-+except ImportError:
++except (ValueError, ImportError):
 +    have_spice_gtk = False
  
  import logging

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/virt-manager.git