Merge branch 'master' of git://git.ipfire.org/ipfire.org

diff --git a/webapp/backend/fireinfo.py b/webapp/backend/fireinfo.py
index 1bf6747693ac9d2d4293cec6916b4f142e6310fb..42c961c7fb306b0f9c348434952db4a2bc8283d7 100644 (file)
--- a/webapp/backend/fireinfo.py
+++ b/webapp/backend/fireinfo.py
@@ -72,6 +72,9 @@ class ProfileDict(object):
 
 class ProfileNetwork(ProfileDict):
        def __eq__(self, other):
+               if other is None:
+                       return False
+
                if not self.has_red == other.has_red:
                        return False
 
@@ -1249,6 +1252,10 @@ class ProfileParser(Object):
                        for arg in self.__device_args:
                                args[arg] = _device.get(arg, None)
 
+                       # Skip if the subsystem is not set
+                       if not args.get("subsystem", None):
+                               continue
+
                        # Find the device or create a new one.
                        device = self.fireinfo.get_device(**args)
                        if not device: