Re: [PATCH 01/15] classes/recipes/lib: Fix various python whitespace issues

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3309 bytes --]

On Tue, May 07, 2013 at 01:55:53PM +0100, Richard Purdie wrote:
> There are some left over tab characters in the python functions. This
> removes them and resolves python 3 errors.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>  
> @@ -202,13 +202,13 @@ def package_qa_check_useless_rpaths(file, name, d, elf, messages):
>      import re
>      rpath_re = re.compile("\s+RPATH\s+(.*)")
>      for line in phdrs.split("\n"):
> -    	m = rpath_re.match(line)
> -	if m:
> -	   rpath = m.group(1)
> -	   if rpath_eq(rpath, libdir) or rpath_eq(rpath, base_libdir):
> -	      # The dynamic linker searches both these places anyway.  There is no point in
> -	      # looking there again.
> -	      messages.append("%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d), rpath))
> +        m = rpath_re.match(line)
> +        if m:
> +           rpath = m.group(1)
> +           if rpath_eq(rpath, libdir) or rpath_eq(rpath, base_libdir):
> +              # The dynamic linker searches both these places anyway.  There is no point in
> +              # looking there again.
> +              messages.append("%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d), rpath))

last 2 blocks are indented only by 3 spaces

>      if not sane:
>          messages.append("ELF binary '%s' has relocations in .text" % path)
> @@ -498,7 +498,7 @@ def package_qa_hash_style(path, name, d, elf, messages):
>          if "GNU_HASH" in line:
>              sane = True
>          if "[mips32]" in line or "[mips64]" in line:
> -	    sane = True
> +             sane = True

this has 5 spaces

>  
>      if has_syms and not sane:
>          messages.append("No GNU_HASH in the elf binary: '%s'" % path)
> diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
> index 529e82a..40ae006 100644
> --- a/meta/classes/multilib_global.bbclass
> +++ b/meta/classes/multilib_global.bbclass
> @@ -5,7 +5,7 @@ python multilib_virtclass_handler_global () {
>      if isinstance(e, bb.event.RecipePreFinalise):
>          for v in e.data.getVar("MULTILIB_VARIANTS", True).split():
>              if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False) is None:
> -	       e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
> +               e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)

3 spaces again

>  
>      variant = e.data.getVar("BBEXTENDVARIANT", True)
>  
> diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb
> index 24c7ce8..3218754 100644
> --- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
> +++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
> @@ -142,6 +142,6 @@ CSL_VER_MAIN ??= ""
>  
>  python () {
>      if not d.getVar("CSL_VER_MAIN"):
> -	raise bb.parse.SkipPackage("External CSL toolchain not configured (CSL_VER_MAIN not set).")
> +        	raise bb.parse.SkipPackage("External CSL toolchain not configured (CSL_VER_MAIN not set).")

spaces AND tab

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]