[libvirt] [PATCH] python: Better error reporting if 'import libvirtmod' fails

[Daniel P. Berrange]

On Mon, May 18, 2009 at 01:57:47PM -0400, Cole Robinson wrote:
> Don't squash a possibly legitimate libvirtmod error (e.g. some from
> clashing libvirt.so versions) with 'Cannot import cygvirtmod'
> ---
>  python/libvir.py |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/python/libvir.py b/python/libvir.py
> index 8a16dd0..3cda8dc 100644
> --- 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

ACK


Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|