[Toaster] [PATCH 1/1] toaster: fix banner after customimage package add

[Michael Wood]

On 19/02/16 22:23, Dave Lerner wrote:
> 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 <dave.lerner at windriver.com>
> ---
>   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");
>         }

Belen tested the UI part and code looks fine to me.
>   
> 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)

Packages included was the correct place for these to be added. This 
includes_set is a list of all the packages that have *not* been added by 
the user themselves, they get brought in when bitbake does the package 
level dependency resolution. bitbake is in control of dependency 
resolution, we aren't a package manager so we do a best guess based on 
previous build, this gets corrected automatically after rebuilding the 
recipe.



>                       except:
>                           logger.warning("Could not add package's suggested"
>                                          "dependencies to the list")

Thanks,

Michael