From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 16 Jan 2014 18:37:32 +0000 (-0500)
Subject: python3: Don't fail in list_containers on ValueError
X-Git-Tag: lxc-1.0.0.beta3~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a539732721c45939ab79c01abd19298e4e5c74ca;p=thirdparty%2Flxc.git

python3: Don't fail in list_containers on ValueError

ValueError typically means that the user doesn't have permissions to
access the directory. Raising an exception there isn't consistent with
other error behaviour of list_containers which simple returns an empty
tuple.

So simply catch the exception and ignore it. An error message is already
printed by LXC itself anyway.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/python-lxc/lxc/__init__.py b/src/python-lxc/lxc/__init__.py
index 0ca3e54c5..c274a12a1 100644
--- a/src/python-lxc/lxc/__init__.py
+++ b/src/python-lxc/lxc/__init__.py
@@ -386,10 +386,16 @@ def list_containers(active=True, defined=True,
     if config_path:
         if not os.path.exists(config_path):
             return tuple()
-        entries = _lxc.list_containers(active=active, defined=defined,
-                                       config_path=config_path)
+        try:
+            entries = _lxc.list_containers(active=active, defined=defined,
+                                           config_path=config_path)
+        except ValueError:
+            return tuple()
     else:
-        entries = _lxc.list_containers(active=active, defined=defined)
+        try:
+            entries = _lxc.list_containers(active=active, defined=defined)
+        except ValueError:
+            return tuple()
 
     if as_object:
         return tuple([Container(name, config_path) for name in entries])