Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/
Date: Tue, 02 Sep 2014 05:55:01
Message-Id: 1409637114.d1c8dce78d8615d17602f131dca159daf52dcdaa.dol-sen@gentoo
1 commit: d1c8dce78d8615d17602f131dca159daf52dcdaa
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 22 00:10:51 2013 +0000
4 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
5 CommitDate: Tue Sep 2 05:51:54 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=d1c8dce7
7
8 Rename all target .py files and classes without _target in them.
9
10 This is so they are the named the same as the target .sh files
11 and work with the now simplified module loading.
12
13 ---
14 catalyst/targets/{embedded_target.py => embedded.py} | 2 +-
15 catalyst/targets/{grp_target.py => grp.py} | 2 +-
16 catalyst/targets/{livecd_stage1_target.py => livecd_stage1.py} | 2 +-
17 catalyst/targets/{livecd_stage2_target.py => livecd_stage2.py} | 2 +-
18 catalyst/targets/{netboot_target.py => netboot.py} | 2 +-
19 catalyst/targets/{netboot2_target.py => netboot2.py} | 2 +-
20 catalyst/targets/{stage1_target.py => stage1.py} | 2 +-
21 catalyst/targets/{stage2_target.py => stage2.py} | 2 +-
22 catalyst/targets/{stage3_target.py => stage3.py} | 2 +-
23 catalyst/targets/{stage4_target.py => stage4.py} | 2 +-
24 catalyst/targets/{tinderbox_target.py => tinderbox.py} | 2 +-
25 11 files changed, 11 insertions(+), 11 deletions(-)
26
27 diff --git a/catalyst/targets/embedded_target.py b/catalyst/targets/embedded.py
28 similarity index 98%
29 rename from catalyst/targets/embedded_target.py
30 rename to catalyst/targets/embedded.py
31 index aee0f00..3309278 100644
32 --- a/catalyst/targets/embedded_target.py
33 +++ b/catalyst/targets/embedded.py
34 @@ -15,7 +15,7 @@ from catalyst.support import normpath
35
36 from catalyst.base.stagebase import StageBase
37
38 -class embedded_target(StageBase):
39 +class embedded(StageBase):
40 """
41 Builder class for embedded target
42 """
43
44 diff --git a/catalyst/targets/grp_target.py b/catalyst/targets/grp.py
45 similarity index 99%
46 rename from catalyst/targets/grp_target.py
47 rename to catalyst/targets/grp.py
48 index e3f08a2..0075714 100644
49 --- a/catalyst/targets/grp_target.py
50 +++ b/catalyst/targets/grp.py
51 @@ -14,7 +14,7 @@ from catalyst.support import (CatalystError, normpath,
52 from catalyst.base.stagebase import StageBase
53
54
55 -class grp_target(StageBase):
56 +class grp(StageBase):
57 """
58 The builder class for GRP (Gentoo Reference Platform) builds.
59 """
60
61 diff --git a/catalyst/targets/livecd_stage1_target.py b/catalyst/targets/livecd_stage1.py
62 similarity index 98%
63 rename from catalyst/targets/livecd_stage1_target.py
64 rename to catalyst/targets/livecd_stage1.py
65 index 9c74253..661e06e 100644
66 --- a/catalyst/targets/livecd_stage1_target.py
67 +++ b/catalyst/targets/livecd_stage1.py
68 @@ -13,7 +13,7 @@ from catalyst.support import (normpath,
69 from catalyst.base.stagebase import StageBase
70
71
72 -class livecd_stage1_target(StageBase):
73 +class livecd_stage1(StageBase):
74 """
75 Builder class for LiveCD stage1.
76 """
77
78 diff --git a/catalyst/targets/livecd_stage2_target.py b/catalyst/targets/livecd_stage2.py
79 similarity index 99%
80 rename from catalyst/targets/livecd_stage2_target.py
81 rename to catalyst/targets/livecd_stage2.py
82 index a4630e6..20f6014 100644
83 --- a/catalyst/targets/livecd_stage2_target.py
84 +++ b/catalyst/targets/livecd_stage2.py
85 @@ -10,7 +10,7 @@ from catalyst.support import (normpath, file_locate, CatalystError, cmd,
86 from catalyst.base.stagebase import StageBase
87
88
89 -class livecd_stage2_target(StageBase):
90 +class livecd_stage2(StageBase):
91 """
92 Builder class for a LiveCD stage2 build.
93 """
94
95 diff --git a/catalyst/targets/netboot_target.py b/catalyst/targets/netboot.py
96 similarity index 99%
97 rename from catalyst/targets/netboot_target.py
98 rename to catalyst/targets/netboot.py
99 index 9d92ef2..f753c7f 100644
100 --- a/catalyst/targets/netboot_target.py
101 +++ b/catalyst/targets/netboot.py
102 @@ -12,7 +12,7 @@ from catalyst.support import (CatalystError, normpath,
103 from catalyst.base.stagebase import StageBase
104
105
106 -class netboot_target(StageBase):
107 +class netboot(StageBase):
108 """
109 Builder class for a netboot build.
110 """
111
112 diff --git a/catalyst/targets/netboot2_target.py b/catalyst/targets/netboot2.py
113 similarity index 99%
114 rename from catalyst/targets/netboot2_target.py
115 rename to catalyst/targets/netboot2.py
116 index 130e2b6..fc8c64c 100644
117 --- a/catalyst/targets/netboot2_target.py
118 +++ b/catalyst/targets/netboot2.py
119 @@ -14,7 +14,7 @@ from catalyst.support import (CatalystError, normpath,
120 from catalyst.base.stagebase import StageBase
121
122
123 -class netboot2_target(StageBase):
124 +class netboot2(StageBase):
125 """
126 Builder class for a netboot build, version 2
127 """
128
129 diff --git a/catalyst/targets/stage1_target.py b/catalyst/targets/stage1.py
130 similarity index 99%
131 rename from catalyst/targets/stage1_target.py
132 rename to catalyst/targets/stage1.py
133 index 2329b58..e72cbcc 100644
134 --- a/catalyst/targets/stage1_target.py
135 +++ b/catalyst/targets/stage1.py
136 @@ -9,7 +9,7 @@ from catalyst.support import normpath, list_to_string
137 from catalyst.base.stagebase import StageBase
138
139
140 -class stage1_target(StageBase):
141 +class stage1(StageBase):
142 """
143 Builder class for a stage1 installation tarball build.
144 """
145
146 diff --git a/catalyst/targets/stage2_target.py b/catalyst/targets/stage2.py
147 similarity index 98%
148 rename from catalyst/targets/stage2_target.py
149 rename to catalyst/targets/stage2.py
150 index ec6d78d..884b20d 100644
151 --- a/catalyst/targets/stage2_target.py
152 +++ b/catalyst/targets/stage2.py
153 @@ -9,7 +9,7 @@ from catalyst.support import normpath, list_to_string
154 from catalyst.base.stagebase import StageBase
155
156
157 -class stage2_target(StageBase):
158 +class stage2(StageBase):
159 """
160 Builder class for a stage2 installation tarball build.
161 """
162
163 diff --git a/catalyst/targets/stage3_target.py b/catalyst/targets/stage3.py
164 similarity index 96%
165 rename from catalyst/targets/stage3_target.py
166 rename to catalyst/targets/stage3.py
167 index 103242d..cc3e520 100644
168 --- a/catalyst/targets/stage3_target.py
169 +++ b/catalyst/targets/stage3.py
170 @@ -6,7 +6,7 @@ stage3 target, builds upon previous stage2/stage3 tarball
171 from catalyst.base.stagebase import StageBase
172
173
174 -class stage3_target(StageBase):
175 +class stage3(StageBase):
176 """
177 Builder class for a stage3 installation tarball build.
178 """
179
180 diff --git a/catalyst/targets/stage4_target.py b/catalyst/targets/stage4.py
181 similarity index 97%
182 rename from catalyst/targets/stage4_target.py
183 rename to catalyst/targets/stage4.py
184 index 4dbdb45..4aef33f 100644
185 --- a/catalyst/targets/stage4_target.py
186 +++ b/catalyst/targets/stage4.py
187 @@ -6,7 +6,7 @@ stage4 target, builds upon previous stage3/stage4 tarball
188 from catalyst.base.stagebase import StageBase
189
190
191 -class stage4_target(StageBase):
192 +class stage4(StageBase):
193 """
194 Builder class for stage4.
195 """
196
197 diff --git a/catalyst/targets/tinderbox_target.py b/catalyst/targets/tinderbox.py
198 similarity index 97%
199 rename from catalyst/targets/tinderbox_target.py
200 rename to catalyst/targets/tinderbox.py
201 index 0c389e6..4cb7537 100644
202 --- a/catalyst/targets/tinderbox_target.py
203 +++ b/catalyst/targets/tinderbox.py
204 @@ -9,7 +9,7 @@ from catalyst.support import cmd, list_bashify, CatalystError
205 from catalyst.base.stagebase import StageBase
206
207
208 -class tinderbox_target(StageBase):
209 +class tinderbox(StageBase):
210 """
211 Builder class for the tinderbox target
212 """