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'

diff --git a/ChangeLog b/ChangeLog
index 6545a016175d51e5f2c45c40a7406b941e9ec33f..4dbc5dad1bcd875b5d6ef48b6ee84c1511537002 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 19 09:00:43 EDT 2009 Cole Robinson <crobinso@redhat.com>
+
+       * python/libvir.py: Don't overwrite legitimate python import error.
+
 Tue May 19 12:04:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
        Fix misc locking bugs identified by lock checker

diff --git a/python/libvir.py b/python/libvir.py
index 8a16dd0be8c03ed101a471195a185c4ea13d72d6..3cda8dc77c1766a972f4a4f10ec1c0df033e61ed 100644 (file)
--- a/python/libvir.py
+++ b/python/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