From: "Brian Dolbec" <dolsen@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/ Date: Thu, 1 Jan 2015 05:59:04 +0000 (UTC) [thread overview] Message-ID: <1420091886.9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3.dolsen@gentoo> (raw) commit: 9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Mon Feb 25 00:29:52 2013 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> 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"]
WARNING: multiple messages have this Message-ID (diff)
From: "Brian Dolbec" <dolsen@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ Date: Thu, 26 Feb 2015 20:12:43 +0000 (UTC) [thread overview] Message-ID: <1420091886.9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3.dolsen@gentoo> (raw) Message-ID: <20150226201243.toRpmXj29NN6mAwNC-mzA1YOmFb6Hkoxg5-xw3yvpXE@z> (raw) commit: 9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Mon Feb 25 00:29:52 2013 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> 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"]
next reply other threads:[~2015-01-01 5:59 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-01 5:59 Brian Dolbec [this message] 2015-02-26 20:12 ` [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ Brian Dolbec -- strict thread matches above, loose matches on Subject: below -- 2017-11-29 17:20 Brian Dolbec 2017-11-22 15:52 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec 2017-03-16 22:57 Brian Dolbec 2017-03-11 7:07 Brian Dolbec 2017-03-10 18:38 Brian Dolbec 2017-03-09 10:02 Brian Dolbec 2017-03-09 9:39 Brian Dolbec 2015-11-12 16:24 [gentoo-commits] proj/catalyst:master " Brian Dolbec 2015-11-21 1:33 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec 2015-02-26 20:12 [gentoo-commits] proj/catalyst:master " Brian Dolbec 2015-01-01 5:59 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec 2015-02-26 19:25 Brian Dolbec 2015-01-01 5:59 Brian Dolbec 2014-09-11 3:08 Brian Dolbec 2014-09-02 23:10 Brian Dolbec 2014-09-02 7:12 Brian Dolbec 2014-09-02 5:54 Brian Dolbec 2014-09-02 5:54 Brian Dolbec 2014-09-02 2:43 Brian Dolbec 2014-09-02 2:43 Brian Dolbec 2014-06-15 14:56 Brian Dolbec 2014-06-15 14:56 Brian Dolbec 2014-06-14 5:58 Brian Dolbec 2014-06-14 5:58 Brian Dolbec 2014-05-05 19:17 [gentoo-commits] proj/catalyst:master " Brian Dolbec 2014-05-05 19:15 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec 2014-04-02 20:09 Brian Dolbec 2014-04-02 20:09 Brian Dolbec 2014-04-02 20:09 Brian Dolbec 2014-03-22 22:25 Brian Dolbec 2014-03-22 22:25 Brian Dolbec 2014-03-22 22:25 Brian Dolbec 2014-03-02 16:07 Brian Dolbec 2014-03-02 16:07 Brian Dolbec 2014-03-02 16:07 Brian Dolbec 2014-02-22 21:48 Brian Dolbec 2014-02-22 21:48 Brian Dolbec 2014-02-22 21:48 Brian Dolbec 2014-02-22 18:43 Brian Dolbec 2014-02-22 18:43 Brian Dolbec 2014-02-22 18:43 Brian Dolbec 2014-01-22 15:52 Brian Dolbec 2014-01-22 15:52 Brian Dolbec 2014-01-22 15:52 Brian Dolbec 2014-01-03 6:41 Brian Dolbec 2014-01-03 6:12 Brian Dolbec 2014-01-03 5:03 Brian Dolbec 2014-01-03 5:03 Brian Dolbec 2014-01-03 5:03 Brian Dolbec 2014-01-03 5:03 Brian Dolbec 2014-01-03 5:03 Brian Dolbec 2014-01-02 0:04 Brian Dolbec 2014-01-02 0:04 Brian Dolbec 2014-01-02 0:04 Brian Dolbec 2014-01-02 0:04 Brian Dolbec 2014-01-02 0:04 Brian Dolbec 2014-01-01 22:27 Brian Dolbec 2014-01-01 22:13 Brian Dolbec 2013-12-31 18:56 Anthony G. Basile 2013-12-31 18:14 Brian Dolbec 2013-12-31 18:14 Brian Dolbec 2013-12-31 18:14 Brian Dolbec 2013-12-31 4:48 Brian Dolbec 2013-12-31 4:48 Brian Dolbec 2013-12-31 4:48 Brian Dolbec 2013-12-31 4:39 Brian Dolbec 2013-12-31 4:39 Brian Dolbec 2013-12-31 4:39 Brian Dolbec 2013-12-31 4:22 Brian Dolbec 2013-12-31 4:22 Brian Dolbec 2013-12-31 4:22 Brian Dolbec
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1420091886.9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3.dolsen@gentoo \ --to=dolsen@gentoo.org \ --cc=gentoo-commits@lists.gentoo.org \ --cc=gentoo-dev@lists.gentoo.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox