From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E36431389E2 for ; Thu, 1 Jan 2015 05:59:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07460E08A2; Thu, 1 Jan 2015 05:59:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBCB6E089D for ; Thu, 1 Jan 2015 05:59:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CE0D3406D6 for ; Thu, 1 Jan 2015 05:59:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A5FCE9F5 for ; Thu, 1 Jan 2015 05:59:04 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1420091886.9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/livecd_stage2.py catalyst/targets/netboot.py catalyst/targets/netboot2.py catalyst/targets/stage4.py catalyst/targets/tinderbox.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3 X-VCS-Branch: pending Date: Thu, 1 Jan 2015 05:59:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3c3f9577-2299-49a6-a7b4-714c9bbd33bf X-Archives-Hash: 96a029e3402ab627e901286988a7aba3 commit: 9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3 Author: Brian Dolbec gentoo org> AuthorDate: Mon Feb 25 00:29:52 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 1 05:58:06 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9ce3a913 Mixed spaces/tabs and indent cleanup. --- catalyst/targets/livecd_stage2.py | 2 +- catalyst/targets/netboot.py | 11 +++++------ catalyst/targets/netboot2.py | 10 +++++----- catalyst/targets/stage4.py | 18 +++++++++--------- catalyst/targets/tinderbox.py | 8 ++++---- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 949ee98..b1cf6b2 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -49,7 +49,7 @@ class livecd_stage2(StageBase): print_traceback=True) def set_spec_prefix(self): - self.settings["spec_prefix"]="livecd" + self.settings["spec_prefix"]="livecd" def set_target_path(self): self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/") diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py index 7ae1d75..de8dc85 100644 --- a/catalyst/targets/netboot.py +++ b/catalyst/targets/netboot.py @@ -122,13 +122,12 @@ class netboot(StageBase): self.unbind() raise CatalystError("netboot build aborting due to error.", print_traceback=True) - # end print "netboot: build finished !" def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot", - "config_profile_link","setup_confdir","bind","chroot_setup",\ - "setup_environment","build_packages","build_busybox",\ - "build_kernel","copy_files_to_image",\ - "clean","create_netboot_files","unbind","clear_autoresume"] + self.settings["action_sequence"]=["unpack","unpack_snapshot", + "config_profile_link","setup_confdir","bind","chroot_setup",\ + "setup_environment","build_packages","build_busybox",\ + "build_kernel","copy_files_to_image",\ + "clean","create_netboot_files","unbind","clear_autoresume"] diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py index dbbb6a9..e9e2625 100644 --- a/catalyst/targets/netboot2.py +++ b/catalyst/targets/netboot2.py @@ -164,8 +164,8 @@ class netboot2(StageBase): touch(self.settings["autoresume_path"]+"empty") def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link", - "setup_confdir","portage_overlay","bind","chroot_setup",\ - "setup_environment","build_packages","root_overlay",\ - "copy_files_to_image","setup_overlay","build_kernel","move_kernels",\ - "remove","empty","unbind","clean","clear_autoresume"] + self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link", + "setup_confdir","portage_overlay","bind","chroot_setup",\ + "setup_environment","build_packages","root_overlay",\ + "copy_files_to_image","setup_overlay","build_kernel","move_kernels",\ + "remove","empty","unbind","clean","clear_autoresume"] diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py index 4aef33f..857976b 100644 --- a/catalyst/targets/stage4.py +++ b/catalyst/targets/stage4.py @@ -14,10 +14,10 @@ class stage4(StageBase): self.required_values=["stage4/packages"] self.valid_values=self.required_values[:] self.valid_values.extend(["stage4/use","boot/kernel",\ - "stage4/root_overlay","stage4/fsscript",\ - "stage4/gk_mainargs","splash_theme",\ - "portage_overlay","stage4/rcadd","stage4/rcdel",\ - "stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"]) + "stage4/root_overlay","stage4/fsscript",\ + "stage4/gk_mainargs","splash_theme",\ + "portage_overlay","stage4/rcadd","stage4/rcdel",\ + "stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"]) StageBase.__init__(self,spec,addlargs) def set_cleanables(self): @@ -25,11 +25,11 @@ class stage4(StageBase): def set_action_sequence(self): self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","portage_overlay",\ - "bind","chroot_setup","setup_environment","build_packages",\ - "build_kernel","bootloader","root_overlay","fsscript",\ - "preclean","rcupdate","unmerge","unbind","remove","empty",\ - "clean"] + "config_profile_link","setup_confdir","portage_overlay",\ + "bind","chroot_setup","setup_environment","build_packages",\ + "build_kernel","bootloader","root_overlay","fsscript",\ + "preclean","rcupdate","unmerge","unbind","remove","empty",\ + "clean"] # if "TARBALL" in self.settings or \ # "fetch" not in self.settings['options']: diff --git a/catalyst/targets/tinderbox.py b/catalyst/targets/tinderbox.py index 59e85d0..c9ed9b8 100644 --- a/catalyst/targets/tinderbox.py +++ b/catalyst/targets/tinderbox.py @@ -24,7 +24,7 @@ class tinderbox(StageBase): # example call: "grp.sh run xmms vim sys-apps/gleep" try: if os.path.exists(self.settings["controller_file"]): - cmd(self.settings["controller_file"]+" run "+\ + cmd(self.settings["controller_file"]+" run "+\ list_bashify(self.settings["tinderbox/packages"]),"run script failed.",env=self.env) except CatalystError: @@ -43,6 +43,6 @@ class tinderbox(StageBase): def set_action_sequence(self): #Default action sequence for run method self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","bind","chroot_setup",\ - "setup_environment","run_local","preclean","unbind","clean",\ - "clear_autoresume"] + "config_profile_link","setup_confdir","bind","chroot_setup",\ + "setup_environment","run_local","preclean","unbind","clean",\ + "clear_autoresume"] From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A8297138ADA for ; Thu, 26 Feb 2015 20:13:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D64CE08BE; Thu, 26 Feb 2015 20:12:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97BF6E08BE for ; Thu, 26 Feb 2015 20:12:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 203FA340C53 for ; Thu, 26 Feb 2015 20:12:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 126A2129D9 for ; Thu, 26 Feb 2015 20:12:43 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1420091886.9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/livecd_stage2.py catalyst/targets/netboot.py catalyst/targets/netboot2.py catalyst/targets/stage4.py catalyst/targets/tinderbox.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3 X-VCS-Branch: master Date: Thu, 26 Feb 2015 20:12:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b2717c79-eeec-4432-b489-52398a3ad359 X-Archives-Hash: 47ca0e9833c862651c90cc4df8ab062f Message-ID: <20150226201243.toRpmXj29NN6mAwNC-mzA1YOmFb6Hkoxg5-xw3yvpXE@z> commit: 9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3 Author: Brian Dolbec gentoo org> AuthorDate: Mon Feb 25 00:29:52 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 1 05:58:06 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9ce3a913 Mixed spaces/tabs and indent cleanup. --- catalyst/targets/livecd_stage2.py | 2 +- catalyst/targets/netboot.py | 11 +++++------ catalyst/targets/netboot2.py | 10 +++++----- catalyst/targets/stage4.py | 18 +++++++++--------- catalyst/targets/tinderbox.py | 8 ++++---- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 949ee98..b1cf6b2 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -49,7 +49,7 @@ class livecd_stage2(StageBase): print_traceback=True) def set_spec_prefix(self): - self.settings["spec_prefix"]="livecd" + self.settings["spec_prefix"]="livecd" def set_target_path(self): self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/") diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py index 7ae1d75..de8dc85 100644 --- a/catalyst/targets/netboot.py +++ b/catalyst/targets/netboot.py @@ -122,13 +122,12 @@ class netboot(StageBase): self.unbind() raise CatalystError("netboot build aborting due to error.", print_traceback=True) - # end print "netboot: build finished !" def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot", - "config_profile_link","setup_confdir","bind","chroot_setup",\ - "setup_environment","build_packages","build_busybox",\ - "build_kernel","copy_files_to_image",\ - "clean","create_netboot_files","unbind","clear_autoresume"] + self.settings["action_sequence"]=["unpack","unpack_snapshot", + "config_profile_link","setup_confdir","bind","chroot_setup",\ + "setup_environment","build_packages","build_busybox",\ + "build_kernel","copy_files_to_image",\ + "clean","create_netboot_files","unbind","clear_autoresume"] diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py index dbbb6a9..e9e2625 100644 --- a/catalyst/targets/netboot2.py +++ b/catalyst/targets/netboot2.py @@ -164,8 +164,8 @@ class netboot2(StageBase): touch(self.settings["autoresume_path"]+"empty") def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link", - "setup_confdir","portage_overlay","bind","chroot_setup",\ - "setup_environment","build_packages","root_overlay",\ - "copy_files_to_image","setup_overlay","build_kernel","move_kernels",\ - "remove","empty","unbind","clean","clear_autoresume"] + self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link", + "setup_confdir","portage_overlay","bind","chroot_setup",\ + "setup_environment","build_packages","root_overlay",\ + "copy_files_to_image","setup_overlay","build_kernel","move_kernels",\ + "remove","empty","unbind","clean","clear_autoresume"] diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py index 4aef33f..857976b 100644 --- a/catalyst/targets/stage4.py +++ b/catalyst/targets/stage4.py @@ -14,10 +14,10 @@ class stage4(StageBase): self.required_values=["stage4/packages"] self.valid_values=self.required_values[:] self.valid_values.extend(["stage4/use","boot/kernel",\ - "stage4/root_overlay","stage4/fsscript",\ - "stage4/gk_mainargs","splash_theme",\ - "portage_overlay","stage4/rcadd","stage4/rcdel",\ - "stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"]) + "stage4/root_overlay","stage4/fsscript",\ + "stage4/gk_mainargs","splash_theme",\ + "portage_overlay","stage4/rcadd","stage4/rcdel",\ + "stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"]) StageBase.__init__(self,spec,addlargs) def set_cleanables(self): @@ -25,11 +25,11 @@ class stage4(StageBase): def set_action_sequence(self): self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","portage_overlay",\ - "bind","chroot_setup","setup_environment","build_packages",\ - "build_kernel","bootloader","root_overlay","fsscript",\ - "preclean","rcupdate","unmerge","unbind","remove","empty",\ - "clean"] + "config_profile_link","setup_confdir","portage_overlay",\ + "bind","chroot_setup","setup_environment","build_packages",\ + "build_kernel","bootloader","root_overlay","fsscript",\ + "preclean","rcupdate","unmerge","unbind","remove","empty",\ + "clean"] # if "TARBALL" in self.settings or \ # "fetch" not in self.settings['options']: diff --git a/catalyst/targets/tinderbox.py b/catalyst/targets/tinderbox.py index 59e85d0..c9ed9b8 100644 --- a/catalyst/targets/tinderbox.py +++ b/catalyst/targets/tinderbox.py @@ -24,7 +24,7 @@ class tinderbox(StageBase): # example call: "grp.sh run xmms vim sys-apps/gleep" try: if os.path.exists(self.settings["controller_file"]): - cmd(self.settings["controller_file"]+" run "+\ + cmd(self.settings["controller_file"]+" run "+\ list_bashify(self.settings["tinderbox/packages"]),"run script failed.",env=self.env) except CatalystError: @@ -43,6 +43,6 @@ class tinderbox(StageBase): def set_action_sequence(self): #Default action sequence for run method self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","bind","chroot_setup",\ - "setup_environment","run_local","preclean","unbind","clean",\ - "clear_autoresume"] + "config_profile_link","setup_confdir","bind","chroot_setup",\ + "setup_environment","run_local","preclean","unbind","clean",\ + "clear_autoresume"]