| 1 |
commit: 4f0fa29d5a2499b7178dc4d19f7693e52eb8def9 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 18 03:15:02 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 23 16:19:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4f0fa29d |
| 7 |
|
| 8 |
catalyst: Deduplicate prepare_sequence assignments |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
catalyst/base/stagebase.py | 13 ++++++------- |
| 13 |
catalyst/targets/embedded.py | 6 ------ |
| 14 |
catalyst/targets/livecd_stage1.py | 6 ------ |
| 15 |
catalyst/targets/livecd_stage2.py | 6 ------ |
| 16 |
catalyst/targets/netboot.py | 6 ------ |
| 17 |
catalyst/targets/stage4.py | 6 ------ |
| 18 |
6 files changed, 6 insertions(+), 37 deletions(-) |
| 19 |
|
| 20 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 21 |
index 53b0a224..3b8d3a6e 100644 |
| 22 |
--- a/catalyst/base/stagebase.py |
| 23 |
+++ b/catalyst/base/stagebase.py |
| 24 |
@@ -84,7 +84,12 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 25 |
"portage_overlay", |
| 26 |
"portage_prefix", |
| 27 |
]) |
| 28 |
- self.prepare_sequence = [] |
| 29 |
+ self.prepare_sequence = [ |
| 30 |
+ self.unpack, |
| 31 |
+ self.config_profile_link, |
| 32 |
+ self.setup_confdir, |
| 33 |
+ self.portage_overlay, |
| 34 |
+ ] |
| 35 |
self.build_sequence = [] |
| 36 |
self.finish_sequence = [] |
| 37 |
|
| 38 |
@@ -498,12 +503,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 39 |
|
| 40 |
def set_action_sequence(self): |
| 41 |
"""Set basic stage1, 2, 3 action sequences""" |
| 42 |
- self.prepare_sequence.extend([ |
| 43 |
- self.unpack, |
| 44 |
- self.config_profile_link, |
| 45 |
- self.setup_confdir, |
| 46 |
- self.portage_overlay, |
| 47 |
- ]) |
| 48 |
self.build_sequence.extend([ |
| 49 |
self.bind, |
| 50 |
self.chroot_setup, |
| 51 |
|
| 52 |
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py |
| 53 |
index 7d328808..83b17ad2 100644 |
| 54 |
--- a/catalyst/targets/embedded.py |
| 55 |
+++ b/catalyst/targets/embedded.py |
| 56 |
@@ -41,12 +41,6 @@ class embedded(StageBase): |
| 57 |
StageBase.__init__(self, spec, addlargs) |
| 58 |
|
| 59 |
def set_action_sequence(self): |
| 60 |
- self.prepare_sequence.extend([ |
| 61 |
- self.unpack, |
| 62 |
- self.config_profile_link, |
| 63 |
- self.setup_confdir, |
| 64 |
- self.portage_overlay, |
| 65 |
- ]) |
| 66 |
self.build_sequence.extend([ |
| 67 |
self.bind, |
| 68 |
self.chroot_setup, |
| 69 |
|
| 70 |
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py |
| 71 |
index eb6bb0f0..9fe95a00 100644 |
| 72 |
--- a/catalyst/targets/livecd_stage1.py |
| 73 |
+++ b/catalyst/targets/livecd_stage1.py |
| 74 |
@@ -23,12 +23,6 @@ class livecd_stage1(StageBase): |
| 75 |
StageBase.__init__(self, spec, addlargs) |
| 76 |
|
| 77 |
def set_action_sequence(self): |
| 78 |
- self.prepare_sequence.extend([ |
| 79 |
- self.unpack, |
| 80 |
- self.config_profile_link, |
| 81 |
- self.setup_confdir, |
| 82 |
- self.portage_overlay, |
| 83 |
- ]) |
| 84 |
self.build_sequence.extend([ |
| 85 |
self.bind, |
| 86 |
self.chroot_setup, |
| 87 |
|
| 88 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 89 |
index 5fecff85..ab8f4a0e 100644 |
| 90 |
--- a/catalyst/targets/livecd_stage2.py |
| 91 |
+++ b/catalyst/targets/livecd_stage2.py |
| 92 |
@@ -86,12 +86,6 @@ class livecd_stage2(StageBase): |
| 93 |
print_traceback=True) |
| 94 |
|
| 95 |
def set_action_sequence(self): |
| 96 |
- self.prepare_sequence.extend([ |
| 97 |
- self.unpack, |
| 98 |
- self.config_profile_link, |
| 99 |
- self.setup_confdir, |
| 100 |
- self.portage_overlay, |
| 101 |
- ]) |
| 102 |
self.build_sequence.extend([ |
| 103 |
self.bind, |
| 104 |
self.chroot_setup, |
| 105 |
|
| 106 |
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py |
| 107 |
index 9a7e59e5..cb5e7ae4 100644 |
| 108 |
--- a/catalyst/targets/netboot.py |
| 109 |
+++ b/catalyst/targets/netboot.py |
| 110 |
@@ -158,12 +158,6 @@ class netboot(StageBase): |
| 111 |
self.resume.enable("empty") |
| 112 |
|
| 113 |
def set_action_sequence(self): |
| 114 |
- self.prepare_sequence.extend([ |
| 115 |
- self.unpack, |
| 116 |
- self.config_profile_link, |
| 117 |
- self.setup_confdir, |
| 118 |
- self.portage_overlay, |
| 119 |
- ]) |
| 120 |
self.build_sequence.extend([ |
| 121 |
self.bind, |
| 122 |
self.chroot_setup, |
| 123 |
|
| 124 |
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py |
| 125 |
index 997139a5..9e53f070 100644 |
| 126 |
--- a/catalyst/targets/stage4.py |
| 127 |
+++ b/catalyst/targets/stage4.py |
| 128 |
@@ -39,12 +39,6 @@ class stage4(StageBase): |
| 129 |
self.settings["cleanables"].remove('/etc/resolv.conf') |
| 130 |
|
| 131 |
def set_action_sequence(self): |
| 132 |
- self.prepare_sequence.extend([ |
| 133 |
- self.unpack, |
| 134 |
- self.config_profile_link, |
| 135 |
- self.setup_confdir, |
| 136 |
- self.portage_overlay, |
| 137 |
- ]) |
| 138 |
self.build_sequence.extend([ |
| 139 |
self.bind, |
| 140 |
self.chroot_setup, |
Archives