Only use clear_config_item for lists

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

Only use clear_config_item for lists
8d19ce7b · Stéphane Graber · fcdc3e50 · 8d19ce7b · 8d19ce7b
Commit 8d19ce7b authored Jan 27, 2015 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

__init__.py src/python-lxc/lxc/__init__.py +6 -2

get_item.c src/tests/get_item.c +1 -1

No files found.
--- a/src/python-lxc/lxc/__init__.py
+++ b/src/python-lxc/lxc/__init__.py
@@ -97,8 +97,12 @@ class ContainerNetwork(object):
        return self.__set_network_item(self.props[key], value)
    def __clear_network_item(self, key):
-        return self.container.clear_config_item("lxc.network.%s.%s" % (
+        if key in ("ipv4", "ipv6"):
-                                                self.index, key))
+            return self.container.clear_config_item("lxc.network.%s.%s" % (
+                                                    self.index, key))
+        else:
+            return self.container.set_config_item("lxc.network.%s.%s" % (
+                                                    self.index, key), "")
    def __get_network_item(self, key):
        return self.container.get_config_item("lxc.network.%s.%s" % (

--- a/src/tests/get_item.c
+++ b/src/tests/get_item.c
@@ -249,7 +249,7 @@ int main(int argc, char *argv[])
 		ret = 1;
 		goto out;
 	}
-	if (!c->clear_config_item(c, "lxc.network.0.ipv4.gateway")) {
+	if (!c->set_config_item(c, "lxc.network.0.ipv4.gateway", "")) {
 		fprintf(stderr, "%d: failed clearing ipv4.gateway\n", __LINE__);
 		ret = 1;
 		goto out;