ui/crumbs/configurator: tweak addLayerConf return values
authorJoshua Lock <josh@linux.intel.com>
Fri, 29 Jul 2011 00:27:03 +0000 (17:27 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 2 Aug 2011 21:31:43 +0000 (22:31 +0100)
Use different return types when adding failed versus when the layer is
already enabled.

(Bitbake rev: 906854d75a12c8752efb1e4065eaf1a10b191612)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/bb/ui/crumbs/configurator.py

index e558c95..e17d555 100644 (file)
@@ -158,11 +158,14 @@ class Configurator(gobject.GObject):
     def addLayerConf(self, confpath):
         layerpath = self._splitLayer(confpath)
         name = self._getLayerName(layerpath)
-        if name not in self.enabled_layers:
+
+        if not layerpath or not name:
+            return None, None
+        elif name not in self.enabled_layers:
             self.addLayer(name, layerpath)
             return name, layerpath
         else:
-            return None, None
+            return name, None
 
     def addLayer(self, name, path):
         self.enabled_layers[name] = path