| 1 |
On Mon, 5 Oct 2015 23:19:11 -0400 |
| 2 |
Mike Frysinger <vapier@g.o> wrote: |
| 3 |
|
| 4 |
> --- |
| 5 |
> catalyst/arch/powerpc.py | 2 +- |
| 6 |
> catalyst/arch/sparc.py | 2 +- |
| 7 |
> catalyst/arch/x86.py | 2 +- |
| 8 |
> targets/stage1/build.py | 6 +++--- |
| 9 |
> 4 files changed, 6 insertions(+), 6 deletions(-) |
| 10 |
> |
| 11 |
> diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py |
| 12 |
> index 8e0f540..fb98316 100644 |
| 13 |
> --- a/catalyst/arch/powerpc.py |
| 14 |
> +++ b/catalyst/arch/powerpc.py |
| 15 |
> @@ -14,7 +14,7 @@ class generic_ppc(builder.generic): |
| 16 |
> raise CatalystError("required |
| 17 |
> executable linux32 not found " "(\"emerge setarch\" to fix.)", |
| 18 |
> print_traceback=True) self.settings["CHROOT"]="linux32 chroot" |
| 19 |
> - self.settings["crosscompile"] = False; |
| 20 |
> + self.settings["crosscompile"] = False |
| 21 |
> else: |
| 22 |
> self.settings["CHROOT"]="chroot" |
| 23 |
> |
| 24 |
> diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py |
| 25 |
> index da2ad35..ec69386 100644 |
| 26 |
> --- a/catalyst/arch/sparc.py |
| 27 |
> +++ b/catalyst/arch/sparc.py |
| 28 |
> @@ -13,7 +13,7 @@ class generic_sparc(builder.generic): |
| 29 |
> raise CatalystError("required |
| 30 |
> executable linux32 not found " "(\"emerge setarch\" to fix.)", |
| 31 |
> print_traceback=True) self.settings["CHROOT"]="linux32 chroot" |
| 32 |
> - self.settings["crosscompile"] = False; |
| 33 |
> + self.settings["crosscompile"] = False |
| 34 |
> else: |
| 35 |
> self.settings["CHROOT"]="chroot" |
| 36 |
> |
| 37 |
> diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py |
| 38 |
> index 44a6a49..49500b9 100644 |
| 39 |
> --- a/catalyst/arch/x86.py |
| 40 |
> +++ b/catalyst/arch/x86.py |
| 41 |
> @@ -13,7 +13,7 @@ class generic_x86(builder.generic): |
| 42 |
> raise |
| 43 |
> CatalystError("required executable linux32 not found " "(\"emerge |
| 44 |
> setarch\" to fix.)", print_traceback=True) |
| 45 |
> self.settings["CHROOT"]="linux32 chroot" |
| 46 |
> - self.settings["crosscompile"] = False; |
| 47 |
> + self.settings["crosscompile"] = False |
| 48 |
> else: |
| 49 |
> self.settings["CHROOT"]="chroot" |
| 50 |
> |
| 51 |
> diff --git a/targets/stage1/build.py b/targets/stage1/build.py |
| 52 |
> index b2c8b0f..db6a93f 100755 |
| 53 |
> --- a/targets/stage1/build.py |
| 54 |
> +++ b/targets/stage1/build.py |
| 55 |
> @@ -10,12 +10,12 @@ import portage |
| 56 |
> # last case is for portage-2.1_pre* |
| 57 |
> def scan_profile(file): |
| 58 |
> if "grab_stacked" in dir(portage): |
| 59 |
> - return portage.grab_stacked(file, |
| 60 |
> portage.settings.profiles, portage.grabfile, incremental_lines=1); |
| 61 |
> + return portage.grab_stacked(file, |
| 62 |
> portage.settings.profiles, portage.grabfile, incremental_lines=1) |
| 63 |
> else: if "grab_multiple" in dir(portage): |
| 64 |
> - return |
| 65 |
> portage.stack_lists( portage.grab_multiple(file, |
| 66 |
> portage.settings.profiles, portage.grabfile), incremental=1); |
| 67 |
> + return |
| 68 |
> portage.stack_lists( portage.grab_multiple(file, |
| 69 |
> portage.settings.profiles, portage.grabfile), incremental=1) else: |
| 70 |
> - return |
| 71 |
> portage.stack_lists( [portage.grabfile_package(os.path.join(x, file)) |
| 72 |
> for x in portage.settings.profiles], incremental=1); |
| 73 |
> + return |
| 74 |
> portage.stack_lists( [portage.grabfile_package(os.path.join(x, file)) |
| 75 |
> for x in portage.settings.profiles], incremental=1) # loaded the |
| 76 |
> stacked packages / packages.build files pkgs = |
| 77 |
> scan_profile("packages") |
| 78 |
|
| 79 |
looks good :) |
| 80 |
|
| 81 |
-- |
| 82 |
Brian Dolbec <dolsen> |
Archives