python: Raise IndexError when adding the same network twice

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/network.c b/src/network.c
index 4f297147f82e6d2e2bddcc65cab3507e667891f8..3d386126f103bd3c8716ea3f98ad353588cd4a80 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -511,7 +511,7 @@ LOC_EXPORT int loc_network_tree_add_network(struct loc_network_tree* tree, struc
        // Check if node has not been set before
        if (node->network) {
                DEBUG(tree->ctx, "There is already a network at this path\n");
-               return 1;
+               return -EBUSY;
        }
 
        // Point node to the network

diff --git a/src/python/writer.c b/src/python/writer.c
index e0c37b6b88c6f286d88dfdf26fa963fa6161b05f..a15f77e8cffd8e9cb2ea92070bd329eb298a227f 100644 (file)
--- a/src/python/writer.c
+++ b/src/python/writer.c
@@ -128,8 +128,15 @@ static PyObject* Writer_add_network(WriterObject* self, PyObject* args) {
        // Create network object
        int r = loc_writer_add_network(self->writer, &network, string);
        if (r) {
-               if (r == -EINVAL)
-                       PyErr_SetString(PyExc_ValueError, "Invalid network");
+               switch (r) {
+                       case -EINVAL:
+                               PyErr_SetString(PyExc_ValueError, "Invalid network");
+                               break;
+
+                       case -EBUSY:
+                               PyErr_SetString(PyExc_IndexError, "A network already exists here");
+                               break;
+               }
 
                return NULL;
        }