Image creator bug fixes

From: Joshua Lock <[email protected]>

This series contains a couple of GUI bug fixes intended for Bernard and master.

The first stops unbuildable targets from breaking the image creator, though I'd like to investigate the possibility of stopping such recipes even being shown in the GUI I thought it useful to provide a workaround for the Bernard release.

The second fixes a logic inversions and ensures that the cancel button does the right thing.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: josh/hob-bernard
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/hob-bernard

Thanks,
Joshua Lock <[email protected]>
---

Joshua Lock (2):
bitbake/cooker: don't error in prepareTreeData for unbuildable
targets
bitbake/hob: fix cancel button

 bitbake/lib/bb/cooker.py |    4 +++-
 bitbake/lib/bb/ui/hob.py |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

1.7.4

From: Joshua Lock <[email protected]>

Set abort to False in prepareTreeData so that unbuildable targets do not raise an exception.

---
 bitbake/lib/bb/cooker.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

index 18e9bb8..97863e5 100644
@@ -253,7 +253,9 @@ class BBCooker:
         localdata = data.createCopy(self.configuration.data)
         bb.data.update_data(localdata)
         bb.data.expandKeys(localdata)
-        taskdata = bb.taskdata.TaskData(self.configuration.abort)
+        # We set abort to False here to prevent unbuildable targets raising
+        # an exception when we're just generating data
+        taskdata = bb.taskdata.TaskData(False)
 
         runlist = []
         for k in pkgs_to_build:

1.7.4

From: Joshua Lock <[email protected]>

An accidental logic inversion (aka thinko) had the cancel button only cancel a build when the user didn't confirm the cancellation (i.e. clicked no)...

---
 bitbake/lib/bb/ui/hob.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 5278881..0f8fe8c 100644
@@ -420,7 +420,7 @@ class MainWindow (gtk.Window):
         label.show()
         response = dialog.run()
         dialog.destroy()
-        if not response == gtk.RESPONSE_YES:
+        if response == gtk.RESPONSE_YES:
             self.handler.cancel_build()
         return
 

1.7.4

Merged into poky master, thanks.

Richard