From cbfce0d1daa2e34f553dd71f978b80a7794bf3e6 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 19 May 2009 13:03:03 +0000
Subject: Better error reporting if 'import libvirtmod' fails

Don't squash a possibly legitimate libvirtmod error (e.g. some from
clashing libvirt.so versions) with 'Cannot import cygvirtmod'
---
 libvir.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libvir.py b/libvir.py
index 8a16dd0..3cda8dc 100644
--- a/libvir.py
+++ b/libvir.py
@@ -8,8 +8,12 @@
 # On cygwin, the DLL is called cygvirtmod.dll
 try:
     import libvirtmod
-except:
-    import cygvirtmod as libvirtmod
+except ImportError, lib_e:
+    try:
+        import cygvirtmod as libvirtmod
+    except ImportError, cyg_e:
+        if str(cyg_e).count("No module named"):
+            raise lib_e
 
 import types
 
-- 
cgit