1 |
--- |
2 |
catalyst/base/stagebase.py | 4 ++-- |
3 |
catalyst/targets/netboot2.py | 8 ++++---- |
4 |
2 files changed, 6 insertions(+), 6 deletions(-) |
5 |
|
6 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
7 |
index 432ad5c..a9e7848 100644 |
8 |
--- a/catalyst/base/stagebase.py |
9 |
+++ b/catalyst/base/stagebase.py |
10 |
@@ -24,9 +24,9 @@ from catalyst.fileops import ensure_dirs, pjoin |
11 |
from catalyst.base.resume import AutoResume |
12 |
|
13 |
if sys.version_info[0] >= 3: |
14 |
- py_input = input |
15 |
+ py_input = input |
16 |
else: |
17 |
- py_input = raw_input |
18 |
+ py_input = raw_input |
19 |
|
20 |
|
21 |
class StageBase(TargetBase, ClearBase, GenBase): |
22 |
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py |
23 |
index 5de1a74..e509cf9 100644 |
24 |
--- a/catalyst/targets/netboot2.py |
25 |
+++ b/catalyst/targets/netboot2.py |
26 |
@@ -80,10 +80,10 @@ class netboot2(StageBase): |
27 |
|
28 |
for x in loopy: |
29 |
if "netboot2/packages/"+x+"/files" in self.settings: |
30 |
- if type(self.settings["netboot2/packages/"+x+"/files"]) == types.ListType: |
31 |
- myfiles.extend(self.settings["netboot2/packages/"+x+"/files"]) |
32 |
- else: |
33 |
- myfiles.append(self.settings["netboot2/packages/"+x+"/files"]) |
34 |
+ if type(self.settings["netboot2/packages/"+x+"/files"]) == types.ListType: |
35 |
+ myfiles.extend(self.settings["netboot2/packages/"+x+"/files"]) |
36 |
+ else: |
37 |
+ myfiles.append(self.settings["netboot2/packages/"+x+"/files"]) |
38 |
|
39 |
if "netboot2/extra_files" in self.settings: |
40 |
if type(self.settings["netboot2/extra_files"]) == types.ListType: |
41 |
-- |
42 |
2.5.2 |