Merge branch '2.0' into 2.1

gns3server/controller/__init__.py

@@ -275,6 +275,7 @@ class Controller:
     @settings.setter
     def settings(self, val):
         self._settings = val
+        self.save()
         self.notification.emit("settings.updated", val)
 
     @asyncio.coroutine

gns3server/controller/project.py

@@ -293,7 +293,7 @@ class Project:
                     name = base_name.format(number, id=number, name="Node")
                 except KeyError as e:
                     raise aiohttp.web.HTTPConflict(text="{" + e.args[0] + "} is not a valid replacement string in the node name")
-                except ValueError as e:
+                except (ValueError, IndexError) as e:
                     raise aiohttp.web.HTTPConflict(text="{} is not a valid replacement string in the node name".format(base_name))
                 if name not in self._allocated_node_names:
                     self._allocated_node_names.add(name)

gns3server/controller/topology.py

@@ -142,7 +142,11 @@ def load_topology(path):
     if topo["revision"] < 8:
         topo = _convert_2_0_0(topo, path)
 
-    _check_topology_schema(topo)
+    try:
+        _check_topology_schema(topo)
+    except aiohttp.web.HTTPConflict as e:
+        log.error("Can't load the topology %s", path)
+        raise e
 
     if changed:
         with open(path, "w+", encoding="utf-8") as f: