From cac8f366a9cd6ff0143631b9f2a28f47ad9a1ea2 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Mon, 21 Jan 2013 16:10:51 -0800 Subject: [PATCH] Rename all target .py files and classes without _target in them. This is so they are the named the same as the target .sh files and work with the now simplified module loading. --- catalyst/targets/{embedded_target.py => embedded.py} | 2 +- catalyst/targets/{grp_target.py => grp.py} | 2 +- catalyst/targets/{livecd_stage1_target.py => livecd_stage1.py} | 2 +- catalyst/targets/{livecd_stage2_target.py => livecd_stage2.py} | 2 +- catalyst/targets/{netboot_target.py => netboot.py} | 2 +- catalyst/targets/{netboot2_target.py => netboot2.py} | 2 +- catalyst/targets/{stage1_target.py => stage1.py} | 2 +- catalyst/targets/{stage2_target.py => stage2.py} | 2 +- catalyst/targets/{stage3_target.py => stage3.py} | 2 +- catalyst/targets/{stage4_target.py => stage4.py} | 2 +- catalyst/targets/{tinderbox_target.py => tinderbox.py} | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) rename catalyst/targets/{embedded_target.py => embedded.py} (98%) rename catalyst/targets/{grp_target.py => grp.py} (99%) rename catalyst/targets/{livecd_stage1_target.py => livecd_stage1.py} (98%) rename catalyst/targets/{livecd_stage2_target.py => livecd_stage2.py} (99%) rename catalyst/targets/{netboot_target.py => netboot.py} (99%) rename catalyst/targets/{netboot2_target.py => netboot2.py} (99%) rename catalyst/targets/{stage1_target.py => stage1.py} (99%) rename catalyst/targets/{stage2_target.py => stage2.py} (98%) rename catalyst/targets/{stage3_target.py => stage3.py} (96%) rename catalyst/targets/{stage4_target.py => stage4.py} (97%) rename catalyst/targets/{tinderbox_target.py => tinderbox.py} (97%) diff --git a/catalyst/targets/embedded_target.py b/catalyst/targets/embedded.py similarity index 98% rename from catalyst/targets/embedded_target.py rename to catalyst/targets/embedded.py index aee0f00f..33092783 100644 --- a/catalyst/targets/embedded_target.py +++ b/catalyst/targets/embedded.py @@ -15,7 +15,7 @@ from catalyst.support import normpath from catalyst.base.stagebase import StageBase -class embedded_target(StageBase): +class embedded(StageBase): """ Builder class for embedded target """ diff --git a/catalyst/targets/grp_target.py b/catalyst/targets/grp.py similarity index 99% rename from catalyst/targets/grp_target.py rename to catalyst/targets/grp.py index b0eff7bf..93d30fcc 100644 --- a/catalyst/targets/grp_target.py +++ b/catalyst/targets/grp.py @@ -14,7 +14,7 @@ from catalyst.support import (CatalystError, normpath, from catalyst.base.stagebase import StageBase -class grp_target(StageBase): +class grp(StageBase): """ The builder class for GRP (Gentoo Reference Platform) builds. """ diff --git a/catalyst/targets/livecd_stage1_target.py b/catalyst/targets/livecd_stage1.py similarity index 98% rename from catalyst/targets/livecd_stage1_target.py rename to catalyst/targets/livecd_stage1.py index 19a03e9c..6cbd91a0 100644 --- a/catalyst/targets/livecd_stage1_target.py +++ b/catalyst/targets/livecd_stage1.py @@ -14,7 +14,7 @@ from catalyst.support import (normpath, from catalyst.base.stagebase import StageBase -class livecd_stage1_target(StageBase): +class livecd_stage1(StageBase): """ Builder class for LiveCD stage1. """ diff --git a/catalyst/targets/livecd_stage2_target.py b/catalyst/targets/livecd_stage2.py similarity index 99% rename from catalyst/targets/livecd_stage2_target.py rename to catalyst/targets/livecd_stage2.py index 106b43f2..a5830281 100644 --- a/catalyst/targets/livecd_stage2_target.py +++ b/catalyst/targets/livecd_stage2.py @@ -11,7 +11,7 @@ from catalyst.support import (normpath, file_locate, CatalystError, cmd, from catalyst.base.stagebase import StageBase -class livecd_stage2_target(StageBase): +class livecd_stage2(StageBase): """ Builder class for a LiveCD stage2 build. """ diff --git a/catalyst/targets/netboot_target.py b/catalyst/targets/netboot.py similarity index 99% rename from catalyst/targets/netboot_target.py rename to catalyst/targets/netboot.py index 92352575..7ae1d758 100644 --- a/catalyst/targets/netboot_target.py +++ b/catalyst/targets/netboot.py @@ -13,7 +13,7 @@ from catalyst.support import (CatalystError, normpath, from catalyst.base.stagebase import StageBase -class netboot_target(StageBase): +class netboot(StageBase): """ Builder class for a netboot build. """ diff --git a/catalyst/targets/netboot2_target.py b/catalyst/targets/netboot2.py similarity index 99% rename from catalyst/targets/netboot2_target.py rename to catalyst/targets/netboot2.py index aa35c8ce..e8e7d22d 100644 --- a/catalyst/targets/netboot2_target.py +++ b/catalyst/targets/netboot2.py @@ -15,7 +15,7 @@ from catalyst.support import (CatalystError, normpath, from catalyst.base.stagebase import StageBase -class netboot2_target(StageBase): +class netboot2(StageBase): """ Builder class for a netboot build, version 2 """ diff --git a/catalyst/targets/stage1_target.py b/catalyst/targets/stage1.py similarity index 99% rename from catalyst/targets/stage1_target.py rename to catalyst/targets/stage1.py index 337b202a..bdb87318 100644 --- a/catalyst/targets/stage1_target.py +++ b/catalyst/targets/stage1.py @@ -11,7 +11,7 @@ from catalyst.support import normpath, list_to_string from catalyst.base.stagebase import StageBase -class stage1_target(StageBase): +class stage1(StageBase): """ Builder class for a stage1 installation tarball build. """ diff --git a/catalyst/targets/stage2_target.py b/catalyst/targets/stage2.py similarity index 98% rename from catalyst/targets/stage2_target.py rename to catalyst/targets/stage2.py index 4ecb4655..c447face 100644 --- a/catalyst/targets/stage2_target.py +++ b/catalyst/targets/stage2.py @@ -10,7 +10,7 @@ from catalyst.support import normpath, list_to_string from catalyst.base.stagebase import StageBase -class stage2_target(StageBase): +class stage2(StageBase): """ Builder class for a stage2 installation tarball build. """ diff --git a/catalyst/targets/stage3_target.py b/catalyst/targets/stage3.py similarity index 96% rename from catalyst/targets/stage3_target.py rename to catalyst/targets/stage3.py index ae70df1b..5b95b72e 100644 --- a/catalyst/targets/stage3_target.py +++ b/catalyst/targets/stage3.py @@ -7,7 +7,7 @@ stage3 target, builds upon previous stage2/stage3 tarball from catalyst.base.stagebase import StageBase -class stage3_target(StageBase): +class stage3(StageBase): """ Builder class for a stage3 installation tarball build. """ diff --git a/catalyst/targets/stage4_target.py b/catalyst/targets/stage4.py similarity index 97% rename from catalyst/targets/stage4_target.py rename to catalyst/targets/stage4.py index d3148018..f959c4a5 100644 --- a/catalyst/targets/stage4_target.py +++ b/catalyst/targets/stage4.py @@ -7,7 +7,7 @@ stage4 target, builds upon previous stage3/stage4 tarball from catalyst.base.stagebase import StageBase -class stage4_target(StageBase): +class stage4(StageBase): """ Builder class for stage4. """ diff --git a/catalyst/targets/tinderbox_target.py b/catalyst/targets/tinderbox.py similarity index 97% rename from catalyst/targets/tinderbox_target.py rename to catalyst/targets/tinderbox.py index 96d06529..1c91aac1 100644 --- a/catalyst/targets/tinderbox_target.py +++ b/catalyst/targets/tinderbox.py @@ -11,7 +11,7 @@ from catalyst.support import cmd, list_bashify, CatalystError from catalyst.base.stagebase import StageBase -class tinderbox_target(StageBase): +class tinderbox(StageBase): """ Builder class for the tinderbox target """ -- 2.26.2