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.

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 aee0f00feebdbf9b41ac345d55e0848d2b517bee..33092783caf60ca97ed4c09d09478a6946a63f1d 100644 (file)
--- 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 b0eff7bf5254b5965c277aa986be38f94baef198..93d30fccb64306d3eae13d74c26ec51c74ad2cfb 100644 (file)
--- 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 19a03e9c878c77f21f4cdbcb07c452781508c408..6cbd91a0f072c21d9f6376729491abb9a9ffb6ff 100644 (file)
--- 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 c2e9db8391b06fc60fdf8755040b91d31d9d6365..b1db5586b3ebb28bdb4ab7e298b6f2450b6b365d 100644 (file)
--- 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 923525754b8062082a315c22c97d2d67d124749e..7ae1d7582f92f82e812b3158c4e7d5c5ebb573e6 100644 (file)
--- 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 aa35c8ceabf52d6307a9e98f79930d1d51d354e7..e8e7d22d2ced94d454679983e0afea7764ec62fc 100644 (file)
--- 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 337b202ac58a0ecbb5db996fe51715f67af044e2..bdb873187f7c757d01dc7fce272479522665b8ea 100644 (file)
--- 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 4ecb46551d8724acc8633a583a198fbf344c430c..c447facea5072275a1944068f01a76a0899220fc 100644 (file)
--- 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 ae70df1be791f994037dff388a3b9396679bab18..5b95b72e4021dfb432441e6a857a91252027315a 100644 (file)
--- 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 d314801863636d4f759ad5981b1a138fdb7047cd..f959c4a5b7789f910cbc17e9cd1c6686070156dc 100644 (file)
--- 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 f665bec2951378b21b19497414a101e4ba8fb7f7..f79a13ed1eb58ec572f2eb75f3c1b6cd0b5a08d4 100644 (file)
--- 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
        """