Patchwork sstate: when warnings about sysroot overwrites, say what the recipe was

login
register
mail settings
Submitter Ross Burton
Date Oct. 18, 2012, 9:49 a.m.
Message ID <1350553799-5977-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/38269/
State Accepted
Commit 3bf1848cb747027bd0d281620a008f4d5ce8b6f1
Headers show

Comments

Ross Burton - Oct. 18, 2012, 9:49 a.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/sstate.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Saul Wold - Oct. 18, 2012, 8:33 p.m.
On 10/18/2012 02:49 AM, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/classes/sstate.bbclass |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
> index 3fcaa65..b20b19c 100644
> --- a/meta/classes/sstate.bbclass
> +++ b/meta/classes/sstate.bbclass
> @@ -165,7 +165,7 @@ def sstate_install(ss, d):
>               if realmatch:
>                   match.append(f)
>       if match:
> -        bb.warn("The recipe is trying to install files into a shared area when those files already exist. Those files are:\n   %s" % "\n   ".join(match))
> +        bb.warn("The recipe %s is trying to install files into a shared area when those files already exist. Those files are:\n   %s" % (d.getVar("PN", True), "\n   ".join(match)))
>
>       # Write out the manifest
>       f = open(manifest, "w")
>
Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 3fcaa65..b20b19c 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -165,7 +165,7 @@  def sstate_install(ss, d):
             if realmatch:
                 match.append(f)
     if match:
-        bb.warn("The recipe is trying to install files into a shared area when those files already exist. Those files are:\n   %s" % "\n   ".join(match))
+        bb.warn("The recipe %s is trying to install files into a shared area when those files already exist. Those files are:\n   %s" % (d.getVar("PN", True), "\n   ".join(match)))
 
     # Write out the manifest
     f = open(manifest, "w")