examples: Fix connection error handling

libvirt.open*() does not return None but raises an exception

Signed-off-by: Philipp Hahn <hahn@univention.de>

5 files changed, 15 insertions, 11 deletions

diff --git a/examples/dominfo.py b/examples/dominfo.py
index 0a39f4c..fcfb8ed 100755
--- a/examples/dominfo.py
+++ b/examples/dominfo.py
@@ -34,8 +34,9 @@ if len(sys.argv) != 2:
 name = sys.argv[1]
 
 # Connect to libvirt
-conn = libvirt.openReadOnly(None)
-if conn is None:
+try:
+    conn = libvirt.openReadOnly(None)
+except libvirt.libvirtError:
     print('Failed to open connection to the hypervisor')
     sys.exit(1)
 
diff --git a/examples/domrestore.py b/examples/domrestore.py
index 96f4955..7fd5c8e 100755
--- a/examples/domrestore.py
+++ b/examples/domrestore.py
@@ -20,8 +20,9 @@ if len(sys.argv) != 2:
 dir = sys.argv[1]
 imgs = os.listdir(dir)
 
-conn = libvirt.open(None)
-if conn is None:
+try:
+    conn = libvirt.open(None)
+except libvirt.libvirtError:
     print('Failed to open connection to the hypervisor')
     sys.exit(1)
 
diff --git a/examples/domsave.py b/examples/domsave.py
index 4940cce..f8922d6 100755
--- a/examples/domsave.py
+++ b/examples/domsave.py
@@ -18,8 +18,9 @@ if len(sys.argv) != 2:
 
 dir = sys.argv[1]
 
-conn = libvirt.open(None)
-if conn is None:
+try:
+    conn = libvirt.open(None)
+except libvirt.libvirtError:
     print('Failed to open connection to the hypervisor')
     sys.exit(1)
 
diff --git a/examples/domstart.py b/examples/domstart.py
index 7ff6cb9..f342e95 100755
--- a/examples/domstart.py
+++ b/examples/domstart.py
@@ -32,8 +32,9 @@ if len(sys.argv) != 2:
 
 (name, xmldesc) = read_domain(sys.argv[1])
 
-conn = libvirt.open(None)
-if conn is None:
+try:
+    conn = libvirt.open(None)
+except libvirt.libvirtError:
     print('Failed to open connection to the hypervisor')
     sys.exit(1)
 
diff --git a/examples/esxlist.py b/examples/esxlist.py
index d86e064..caeced1 100755
--- a/examples/esxlist.py
+++ b/examples/esxlist.py
@@ -97,9 +97,9 @@ uri = "esx://%s/?no_verify=1" % hostname
 # in order to log into the vCenter
 auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_NOECHOPROMPT],
         request_credentials, None]
-conn = libvirt.openAuth(uri, auth, 0)
-
-if conn is None:
+try:
+    conn = libvirt.openAuth(uri, auth, 0)
+except libvirt.libvirtError:
     print("Failed to open connection to %s" % hostname)
     sys.exit(1)