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>

python: Remove hardcoded LXCPATH
2495cc91 · Stéphane Graber · fe253caa · 2495cc91 · 2495cc91 · 2495cc91
Commit 2495cc91 authored Dec 05, 2012 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

configure.ac configure.ac +2 -0

api_test.py.in src/python-lxc/examples/api_test.py.in +1 -1

__init__.py.in src/python-lxc/lxc/__init__.py.in +1 -1

No files found.
--- 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


--- a/src/python-lxc/examples/api_test.py
+++ b/src/python-lxc/examples/api_test.py
@@ -30,7 +30,7 @@ import uuid
 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

--- a/src/python-lxc/lxc/__init__.py
+++ b/src/python-lxc/lxc/__init__.py
@@ -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: