diff options
| author | Joshua Lock <josh@linux.intel.com> | 2011-07-22 11:32:27 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-25 12:54:15 +0100 |
| commit | 9cf5190679f372da212cbbbf85e27b9ea6a395f4 (patch) | |
| tree | 1f6fc661ad01e1c1af9f06fa2819a81162841e5f | |
| parent | 52e0be44e068b53959d9566516486b758be718dc (diff) | |
| download | ast2050-yocto-poky-9cf5190679f372da212cbbbf85e27b9ea6a395f4.zip ast2050-yocto-poky-9cf5190679f372da212cbbbf85e27b9ea6a395f4.tar.gz | |
hob: only add new layer's to the UI
If a user added the same layer more than once the underlying bblayers.conf
file would not have multiple entries but the UI would show an entry for
the layer for each time it was added. This patch changes the Configurator
to return None values if the layer wasn't added to bblayers.conf and the
LayerEditor to only update the UI if non-None values are returned.
Fixes [YOCTO #1275]
(Bitbake rev: 9c59baa4da3c863ebc412a56ffd8dbd7a8ffeb60)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/configurator.py | 4 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/layereditor.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/configurator.py b/bitbake/lib/bb/ui/crumbs/configurator.py index 5511799..e7c524a 100644 --- a/bitbake/lib/bb/ui/crumbs/configurator.py +++ b/bitbake/lib/bb/ui/crumbs/configurator.py @@ -139,7 +139,9 @@ class Configurator(gobject.GObject): name = self._getLayerName(layerpath) if name not in self.enabled_layers: self.addLayer(name, layerpath) - return name, layerpath + return name, layerpath + else: + return None, None def addLayer(self, name, path): self.enabled_layers[name] = path diff --git a/bitbake/lib/bb/ui/crumbs/layereditor.py b/bitbake/lib/bb/ui/crumbs/layereditor.py index 76a2eb5..7c581d6 100644 --- a/bitbake/lib/bb/ui/crumbs/layereditor.py +++ b/bitbake/lib/bb/ui/crumbs/layereditor.py @@ -132,5 +132,6 @@ class LayerEditor(gtk.Dialog): # FIXME: verify we've actually got a layer conf? if path.endswith(".conf"): name, layerpath = self.configurator.addLayerConf(path) - self.newly_added[name] = layerpath - self.layer_store.append([name, layerpath, True]) + if name: + self.newly_added[name] = layerpath + self.layer_store.append([name, layerpath, True]) |
