diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-09-02 14:29:38 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-05 20:25:41 +0100 |
commit | 9a6739879191c8b215e4fbce53e2d4c8d278d71a (patch) | |
tree | 4779b701781006492cba04b1d0e0f979fc18e64e /bitbake | |
parent | 7d3d3e90003eaec1009331e357fb579b22fd6e9d (diff) | |
download | poky-9a6739879191c8b215e4fbce53e2d4c8d278d71a.tar.gz |
hob: add a test to ensure hob is run with the required pre and post files
hob requires pre and post configuration files to store configuration values
in, whilst this should (and will) be fixed long-term for so long as we
require these files we should alert the user should they run without them.
Fixes [YOCTO #1383]
(Bitbake rev: bb3e9113074ea1254aa03a247a1a1070682df9c8)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/ui/hob.py | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/bitbake/lib/bb/ui/hob.py b/bitbake/lib/bb/ui/hob.py index 022d1b638a..3b0cacca49 100644 --- a/bitbake/lib/bb/ui/hob.py +++ b/bitbake/lib/bb/ui/hob.py | |||
@@ -982,6 +982,27 @@ class MainWindow (gtk.Window): | |||
982 | def main (server, eventHandler): | 982 | def main (server, eventHandler): |
983 | gobject.threads_init() | 983 | gobject.threads_init() |
984 | 984 | ||
985 | # NOTE: For now we require that the user run with pre and post files to | ||
986 | # read and store configuration set in the GUI. | ||
987 | # We hope to adjust this long term as tracked in Yocto Bugzilla #1441 | ||
988 | # http://bugzilla.pokylinux.org/show_bug.cgi?id=1441 | ||
989 | reqfiles = 0 | ||
990 | dep_files = server.runCommand(["getVariable", "__depends"]) or set() | ||
991 | dep_files.union(server.runCommand(["getVariable", "__base_depends"]) or set()) | ||
992 | for f in dep_files: | ||
993 | if f[0].endswith("hob-pre.conf"): | ||
994 | reqfiles = reqfiles + 1 | ||
995 | elif f[0].endswith("hob-post.conf"): | ||
996 | reqfiles = reqfiles + 1 | ||
997 | if reqfiles == 2: | ||
998 | break | ||
999 | if reqfiles < 2: | ||
1000 | print("""The hob UI requires a pre file named hob-pre.conf and a post | ||
1001 | file named hob-post.conf to store and read its configuration from. Please run | ||
1002 | hob with these files, i.e.\n | ||
1003 | \bitbake -u hob -r conf/hob-pre.conf -R conf/hob-post.conf""") | ||
1004 | return | ||
1005 | |||
985 | taskmodel = TaskListModel() | 1006 | taskmodel = TaskListModel() |
986 | configurator = Configurator() | 1007 | configurator = Configurator() |
987 | handler = HobHandler(taskmodel, server) | 1008 | handler = HobHandler(taskmodel, server) |