python: Remove hardcoded LXCPATH

Switch the python scripts to using @LXCPATH@. According to grep, this was the last occurence of a /var/*/lxc path in the code. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
lxc · Dec 6, 2012 · 2495cc9 · 2495cc9
1 parent fe253ca
commit 2495cc9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -271,6 +271,8 @@ AC_CONFIG_FILES([
 	src/lxc/legacy/lxc-ls
 
 	src/python-lxc/Makefile
+	src/python-lxc/lxc/__init__.py
+	src/python-lxc/examples/api_test.py
 
 	src/tests/Makefile
 

diff --git a/src/python-lxc/examples/api_test.py → src/python-lxc/examples/api_test.py.in b/src/python-lxc/examples/api_test.py → src/python-lxc/examples/api_test.py.in
@@ -30,7 +30,7 @@
 import sys
 
 # Some constants
-LXC_PATH_LIB = "/var/lib/lxc"
+LXC_PATH_LIB = "@LXCPATH@"
 LXC_TEMPLATE = "ubuntu"
 
 # Let's pick a random name, avoiding clashes

diff --git a/src/python-lxc/lxc/__init__.py → src/python-lxc/lxc/__init__.py.in b/src/python-lxc/lxc/__init__.py → src/python-lxc/lxc/__init__.py.in
@@ -465,7 +465,7 @@ def list_containers(as_object=False):
         List the containers on the system.
     """
     containers = []
-    for entry in glob.glob("/var/lib/lxc/*/config"):
+    for entry in glob.glob("@LXCPATH@/*/config"):
         if as_object:
             containers.append(Container(entry.split("/")[-2]))
         else: