Correct formatting of the banner message after adding a package to a custom image. Also, correct the tracking of dependent packages for the added package, adding them to the set of packages appended to the base image rather than the set originally included the base image.
[YOCTO #9101] Signed-off-by: Dave Lerner <[email protected]> --- bitbake/lib/toaster/toastergui/static/js/customrecipe.js | 7 +++++-- bitbake/lib/toaster/toastergui/views.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/static/js/customrecipe.js b/bitbake/lib/toaster/toastergui/static/js/customrecipe.js index a1fe486..3c57899 100644 --- a/bitbake/lib/toaster/toastergui/static/js/customrecipe.js +++ b/bitbake/lib/toaster/toastergui/static/js/customrecipe.js @@ -127,7 +127,8 @@ function customRecipePageInit(ctx) { if (targetPkg.hasOwnProperty('depsAdded') && targetPkg.depsAdded.length > 0) { - msg += "added " + (targetPkg.depsAdded.length + 1); + msg += "added "; + msg += "<strong>" + (targetPkg.depsAdded.length + 1) + "</strong>"; msg += " packages to " + ctx.recipe.name + ": "; msg += "<strong>" + targetPkg.name + "</strong> and its dependencies"; @@ -150,7 +151,9 @@ function customRecipePageInit(ctx) { (targetPkg.depsAdded.length + 1) + " packages added"); } else { - msg += ' <strong>' + targetPkg.name + '<strong>'; + msg += "added <strong>1</strong>"; + msg += " package to " + ctx.recipe.name + ": "; + msg += "<strong>" + targetPkg.name + "</strong>"; inlineNotify.text("1 package added"); } diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index dfa256e..83ba536 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -2644,7 +2644,7 @@ if True: cust_package = CustomImagePackage.objects.get( name=dep.depends_on.name) - recipe.includes_set.add(cust_package) + recipe.appends_set.add(cust_package) except: logger.warning("Could not add package's suggested" "dependencies to the list") -- 1.9.1 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
