diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-04-03 11:16:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-04 11:53:52 +0100 |
commit | 432505d5636a0303dfe3db26db15055d98624dc8 (patch) | |
tree | f841e4d190a1a6e11cb29f4fd11e95e9983f2d5c /bitbake/lib/bb/ui | |
parent | fee85f01bb1d8b2019fea17afba36ad1846c42a7 (diff) | |
download | poky-432505d5636a0303dfe3db26db15055d98624dc8.tar.gz |
bitbake: toaster: fix help texts not showing for most tasks
These were not being collected properly because we were explicitly
excluding variables defined as functions from being stored in the
database. We don't want these to be shown in the variables list, and in
any case it makes sense for these to be stored elsewhere, so create a
separate model to store these.
Fixes [YOCTO #6050].
(Bitbake rev: 0d76a5461ce4bd554ff70a465064969e53edf0a4)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index f448c8448b..2a9e0981c7 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
@@ -25,7 +25,7 @@ import ast | |||
25 | os.environ.setdefault("DJANGO_SETTINGS_MODULE", "toaster.toastermain.settings") | 25 | os.environ.setdefault("DJANGO_SETTINGS_MODULE", "toaster.toastermain.settings") |
26 | 26 | ||
27 | import toaster.toastermain.settings as toaster_django_settings | 27 | import toaster.toastermain.settings as toaster_django_settings |
28 | from toaster.orm.models import Build, Task, Recipe, Layer_Version, Layer, Target, LogMessage | 28 | from toaster.orm.models import Build, Task, Recipe, Layer_Version, Layer, Target, LogMessage, HelpText |
29 | from toaster.orm.models import Target_Image_File | 29 | from toaster.orm.models import Target_Image_File |
30 | from toaster.orm.models import Variable, VariableHistory | 30 | from toaster.orm.models import Variable, VariableHistory |
31 | from toaster.orm.models import Package, Package_File, Target_Installed_Package, Target_File | 31 | from toaster.orm.models import Package, Package_File, Target_Installed_Package, Target_File |
@@ -445,18 +445,23 @@ class ORMWrapper(object): | |||
445 | assert isinstance(build_obj, Build) | 445 | assert isinstance(build_obj, Build) |
446 | 446 | ||
447 | for k in vardump: | 447 | for k in vardump: |
448 | desc = vardump[k]['doc']; | ||
449 | if desc is None: | ||
450 | var_words = [word for word in k.split('_')] | ||
451 | root_var = "_".join([word for word in var_words if word.isupper()]) | ||
452 | if root_var and root_var != k and root_var in vardump: | ||
453 | desc = vardump[root_var]['doc'] | ||
454 | if desc is None: | ||
455 | desc = '' | ||
456 | if desc: | ||
457 | helptext_obj = HelpText.objects.create(build=build_obj, | ||
458 | area=HelpText.VARIABLE, | ||
459 | key=k, | ||
460 | text=desc) | ||
448 | if not bool(vardump[k]['func']): | 461 | if not bool(vardump[k]['func']): |
449 | value = vardump[k]['v']; | 462 | value = vardump[k]['v']; |
450 | if value is None: | 463 | if value is None: |
451 | value = '' | 464 | value = '' |
452 | desc = vardump[k]['doc']; | ||
453 | if desc is None: | ||
454 | var_words = [word for word in k.split('_')] | ||
455 | root_var = "_".join([word for word in var_words if word.isupper()]) | ||
456 | if root_var and root_var != k and root_var in vardump: | ||
457 | desc = vardump[root_var]['doc'] | ||
458 | if desc is None: | ||
459 | desc = '' | ||
460 | variable_obj = Variable.objects.create( build = build_obj, | 465 | variable_obj = Variable.objects.create( build = build_obj, |
461 | variable_name = k, | 466 | variable_name = k, |
462 | variable_value = value, | 467 | variable_value = value, |