On Mon,  5 Oct 2015 23:19:11 -0400
Mike Frysinger <[email protected]> wrote:

> ---
>  catalyst/arch/powerpc.py | 2 +-
>  catalyst/arch/sparc.py   | 2 +-
>  catalyst/arch/x86.py     | 2 +-
>  targets/stage1/build.py  | 6 +++---
>  4 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
> index 8e0f540..fb98316 100644
> --- a/catalyst/arch/powerpc.py
> +++ b/catalyst/arch/powerpc.py
> @@ -14,7 +14,7 @@ class generic_ppc(builder.generic):
>                               raise CatalystError("required
> executable linux32 not found " "(\"emerge setarch\" to fix.)",
> print_traceback=True) self.settings["CHROOT"]="linux32 chroot"
> -                     self.settings["crosscompile"] = False;
> +                     self.settings["crosscompile"] = False
>               else:
>                       self.settings["CHROOT"]="chroot"
>  
> diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py
> index da2ad35..ec69386 100644
> --- a/catalyst/arch/sparc.py
> +++ b/catalyst/arch/sparc.py
> @@ -13,7 +13,7 @@ class generic_sparc(builder.generic):
>                               raise CatalystError("required
> executable linux32 not found " "(\"emerge setarch\" to fix.)",
> print_traceback=True) self.settings["CHROOT"]="linux32 chroot"
> -                     self.settings["crosscompile"] = False;
> +                     self.settings["crosscompile"] = False
>               else:
>                       self.settings["CHROOT"]="chroot"
>  
> diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
> index 44a6a49..49500b9 100644
> --- a/catalyst/arch/x86.py
> +++ b/catalyst/arch/x86.py
> @@ -13,7 +13,7 @@ class generic_x86(builder.generic):
>                                       raise
> CatalystError("required executable linux32 not found " "(\"emerge
> setarch\" to fix.)", print_traceback=True)
> self.settings["CHROOT"]="linux32 chroot"
> -                     self.settings["crosscompile"] = False;
> +                     self.settings["crosscompile"] = False
>               else:
>                       self.settings["CHROOT"]="chroot"
>  
> diff --git a/targets/stage1/build.py b/targets/stage1/build.py
> index b2c8b0f..db6a93f 100755
> --- a/targets/stage1/build.py
> +++ b/targets/stage1/build.py
> @@ -10,12 +10,12 @@ import portage
>  # last case is for portage-2.1_pre*
>  def scan_profile(file):
>       if "grab_stacked" in dir(portage):
> -             return portage.grab_stacked(file,
> portage.settings.profiles, portage.grabfile, incremental_lines=1);
> +             return portage.grab_stacked(file,
> portage.settings.profiles, portage.grabfile, incremental_lines=1)
> else: if "grab_multiple" in dir(portage):
> -                     return
> portage.stack_lists( portage.grab_multiple(file,
> portage.settings.profiles, portage.grabfile), incremental=1);
> +                     return
> portage.stack_lists( portage.grab_multiple(file,
> portage.settings.profiles, portage.grabfile), incremental=1) else:
> -                     return
> portage.stack_lists( [portage.grabfile_package(os.path.join(x, file))
> for x in portage.settings.profiles], incremental=1);
> +                     return
> portage.stack_lists( [portage.grabfile_package(os.path.join(x, file))
> for x in portage.settings.profiles], incremental=1) # loaded the
> stacked packages / packages.build files pkgs =
> scan_profile("packages")

looks good :)

-- 
Brian Dolbec <dolsen>


Reply via email to