From: Stéphane Graber <stgraber@ubuntu.com>
Date: Tue, 27 Jan 2015 17:02:13 +0000 (+0100)
Subject: Only use clear_config_item for lists
X-Git-Tag: lxc-1.1.0.rc4~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d19ce7b9f8b294f054b719da5dc8e1c1d57860e;p=thirdparty%2Flxc.git

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>
---

diff --git a/src/python-lxc/lxc/__init__.py b/src/python-lxc/lxc/__init__.py
index 47b25b8e4..d7b0670dd 100644
--- 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" % (
-                                                self.index, key))
+        if key in ("ipv4", "ipv6"):
+            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" % (
diff --git a/src/tests/get_item.c b/src/tests/get_item.c
index abf50e876..943583cdd 100644
--- 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;