[oe] [oe-commits] Robert Yang : insane.bbclass: make package_qa_clean_path return a relative path

[Martin Jansa]

On Wed, Sep 23, 2015 at 09:12:59PM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master-next
> Commit: 67a1e4b087a39db04370685616d5b439b0f2b505
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=67a1e4b087a39db04370685616d5b439b0f2b505
> 
> Author: Robert Yang <liezhi.yang at windriver.com>
> Date:   Tue Sep 15 19:28:48 2015 -0700
> 
> insane.bbclass: make package_qa_clean_path return a relative path
> 
> Make package_qa_clean_path() return something like "work/path/to/file"
> rather than "/work/path/to/file", the relative path is a little clear.
> 
> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> 
> ---
> 
>  meta/classes/insane.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
> index 72120f5..05e31a7 100644
> --- a/meta/classes/insane.bbclass
> +++ b/meta/classes/insane.bbclass
> @@ -167,7 +167,7 @@ def package_qa_get_machine_dict():
>  
>  def package_qa_clean_path(path,d):
>      """ Remove the common prefix from the path. In this case it is the TMPDIR"""
> -    return path.replace(d.getVar('TMPDIR',True),"")
> +    return path.replace(d.getVar("TMPDIR", True) + "/", "")

Isn't path[len(d.getVar("TMPDIR", True))+1:] a bit faster and safer in
cases where the TMPDIR path is included multiple times?

Or is this function meant to be used also for path which doesn't start
with TMPDIR? Then I agree it should stay replace, but maybe with
maxreplace parameter set to 1.

Same problem with "absolute" path is other QA check I was recently
changing (and I've kept leading / after seeing it somewhere else :)).

Regards,

>  
>  def package_qa_write_error(type, error, d):
>      logfile = d.getVar('QA_LOGFILE', True)
> 
> -- 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20150924/26de6870/attachment-0002.sig>