From 8d19ce7b9f8b294f054b719da5dc8e1c1d57860e Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Tue, 27 Jan 2015 18:02:13 +0100 Subject: [PATCH] Only use clear_config_item for lists MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- src/python-lxc/lxc/__init__.py | 8 ++++++-- src/tests/get_item.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) 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; -- 2.47.2