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/, catalyst/modules/, catalyst/targets/
Date: Tue, 31 Dec 2013 04:48:10
Message-Id: 1388464814.3d06a2fdf7f7c238428dae13efc2caec150ed18b.dol-sen@gentoo
1 commit: 3d06a2fdf7f7c238428dae13efc2caec150ed18b
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 12 07:43:36 2013 +0000
4 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
5 CommitDate: Tue Dec 31 04:40:14 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3d06a2fd
7
8 Rename the modules subpkg to targets, to better reflect what it contains.
9
10 ---
11 catalyst/main.py | 6 +++---
12 catalyst/{modules => targets}/__init__.py | 0
13 catalyst/{modules => targets}/embedded_target.py | 0
14 catalyst/{modules => targets}/generic_stage_target.py | 0
15 catalyst/{modules => targets}/generic_target.py | 0
16 catalyst/{modules => targets}/grp_target.py | 0
17 catalyst/{modules => targets}/livecd_stage1_target.py | 0
18 catalyst/{modules => targets}/livecd_stage2_target.py | 0
19 catalyst/{modules => targets}/netboot2_target.py | 0
20 catalyst/{modules => targets}/netboot_target.py | 0
21 catalyst/{modules => targets}/snapshot_target.py | 0
22 catalyst/{modules => targets}/stage1_target.py | 0
23 catalyst/{modules => targets}/stage2_target.py | 0
24 catalyst/{modules => targets}/stage3_target.py | 0
25 catalyst/{modules => targets}/stage4_target.py | 0
26 catalyst/{modules => targets}/tinderbox_target.py | 0
27 16 files changed, 3 insertions(+), 3 deletions(-)
28
29 diff --git a/catalyst/main.py b/catalyst/main.py
30 index 7b66dab..082d7d9 100644
31 --- a/catalyst/main.py
32 +++ b/catalyst/main.py
33 @@ -201,11 +201,11 @@ def import_modules():
34 targetmap={}
35
36 try:
37 - module_dir = __selfpath__ + "/modules/"
38 + module_dir = __selfpath__ + "/targets/"
39 for x in required_build_targets:
40 try:
41 fh=open(module_dir + x + ".py")
42 - module=imp.load_module(x, fh,"modules/" + x + ".py",
43 + module=imp.load_module(x, fh,"targets/" + x + ".py",
44 (".py", "r", imp.PY_SOURCE))
45 fh.close()
46
47 @@ -215,7 +215,7 @@ def import_modules():
48 for x in valid_build_targets:
49 try:
50 fh=open(module_dir + x + ".py")
51 - module=imp.load_module(x, fh, "modules/" + x + ".py",
52 + module=imp.load_module(x, fh, "targets/" + x + ".py",
53 (".py", "r", imp.PY_SOURCE))
54 module.register(targetmap)
55 fh.close()
56
57 diff --git a/catalyst/modules/__init__.py b/catalyst/targets/__init__.py
58 similarity index 100%
59 rename from catalyst/modules/__init__.py
60 rename to catalyst/targets/__init__.py
61
62 diff --git a/catalyst/modules/embedded_target.py b/catalyst/targets/embedded_target.py
63 similarity index 100%
64 rename from catalyst/modules/embedded_target.py
65 rename to catalyst/targets/embedded_target.py
66
67 diff --git a/catalyst/modules/generic_stage_target.py b/catalyst/targets/generic_stage_target.py
68 similarity index 100%
69 rename from catalyst/modules/generic_stage_target.py
70 rename to catalyst/targets/generic_stage_target.py
71
72 diff --git a/catalyst/modules/generic_target.py b/catalyst/targets/generic_target.py
73 similarity index 100%
74 rename from catalyst/modules/generic_target.py
75 rename to catalyst/targets/generic_target.py
76
77 diff --git a/catalyst/modules/grp_target.py b/catalyst/targets/grp_target.py
78 similarity index 100%
79 rename from catalyst/modules/grp_target.py
80 rename to catalyst/targets/grp_target.py
81
82 diff --git a/catalyst/modules/livecd_stage1_target.py b/catalyst/targets/livecd_stage1_target.py
83 similarity index 100%
84 rename from catalyst/modules/livecd_stage1_target.py
85 rename to catalyst/targets/livecd_stage1_target.py
86
87 diff --git a/catalyst/modules/livecd_stage2_target.py b/catalyst/targets/livecd_stage2_target.py
88 similarity index 100%
89 rename from catalyst/modules/livecd_stage2_target.py
90 rename to catalyst/targets/livecd_stage2_target.py
91
92 diff --git a/catalyst/modules/netboot2_target.py b/catalyst/targets/netboot2_target.py
93 similarity index 100%
94 rename from catalyst/modules/netboot2_target.py
95 rename to catalyst/targets/netboot2_target.py
96
97 diff --git a/catalyst/modules/netboot_target.py b/catalyst/targets/netboot_target.py
98 similarity index 100%
99 rename from catalyst/modules/netboot_target.py
100 rename to catalyst/targets/netboot_target.py
101
102 diff --git a/catalyst/modules/snapshot_target.py b/catalyst/targets/snapshot_target.py
103 similarity index 100%
104 rename from catalyst/modules/snapshot_target.py
105 rename to catalyst/targets/snapshot_target.py
106
107 diff --git a/catalyst/modules/stage1_target.py b/catalyst/targets/stage1_target.py
108 similarity index 100%
109 rename from catalyst/modules/stage1_target.py
110 rename to catalyst/targets/stage1_target.py
111
112 diff --git a/catalyst/modules/stage2_target.py b/catalyst/targets/stage2_target.py
113 similarity index 100%
114 rename from catalyst/modules/stage2_target.py
115 rename to catalyst/targets/stage2_target.py
116
117 diff --git a/catalyst/modules/stage3_target.py b/catalyst/targets/stage3_target.py
118 similarity index 100%
119 rename from catalyst/modules/stage3_target.py
120 rename to catalyst/targets/stage3_target.py
121
122 diff --git a/catalyst/modules/stage4_target.py b/catalyst/targets/stage4_target.py
123 similarity index 100%
124 rename from catalyst/modules/stage4_target.py
125 rename to catalyst/targets/stage4_target.py
126
127 diff --git a/catalyst/modules/tinderbox_target.py b/catalyst/targets/tinderbox_target.py
128 similarity index 100%
129 rename from catalyst/modules/tinderbox_target.py
130 rename to catalyst/targets/tinderbox_target.py