1 |
On Tue, 6 Oct 2015 00:12:04 -0400 |
2 |
Mike Frysinger <vapier@g.o> wrote: |
3 |
|
4 |
> --- |
5 |
> catalyst/base/stagebase.py | 4 ++-- |
6 |
> catalyst/targets/netboot2.py | 8 ++++---- |
7 |
> 2 files changed, 6 insertions(+), 6 deletions(-) |
8 |
> |
9 |
> diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
10 |
> index 432ad5c..a9e7848 100644 |
11 |
> --- a/catalyst/base/stagebase.py |
12 |
> +++ b/catalyst/base/stagebase.py |
13 |
> @@ -24,9 +24,9 @@ from catalyst.fileops import ensure_dirs, pjoin |
14 |
> from catalyst.base.resume import AutoResume |
15 |
> |
16 |
> if sys.version_info[0] >= 3: |
17 |
> - py_input = input |
18 |
> + py_input = input |
19 |
> else: |
20 |
> - py_input = raw_input |
21 |
> + py_input = raw_input |
22 |
> |
23 |
> |
24 |
|
25 |
Ah, my quick copy/paste recently to add a debug pause for Rick to help |
26 |
debug an issue. |
27 |
|
28 |
|
29 |
> class StageBase(TargetBase, ClearBase, GenBase): |
30 |
> diff --git a/catalyst/targets/netboot2.py |
31 |
> b/catalyst/targets/netboot2.py index 5de1a74..e509cf9 100644 |
32 |
> --- a/catalyst/targets/netboot2.py |
33 |
> +++ b/catalyst/targets/netboot2.py |
34 |
> @@ -80,10 +80,10 @@ class netboot2(StageBase): |
35 |
> |
36 |
> for x in loopy: |
37 |
> if "netboot2/packages/"+x+"/files" |
38 |
> in self.settings: |
39 |
> - if |
40 |
> type(self.settings["netboot2/packages/"+x+"/files"]) == |
41 |
> types.ListType: |
42 |
> - |
43 |
> myfiles.extend(self.settings["netboot2/packages/"+x+"/files"]) |
44 |
> - else: |
45 |
> - |
46 |
> myfiles.append(self.settings["netboot2/packages/"+x+"/files"]) |
47 |
> + if |
48 |
> type(self.settings["netboot2/packages/"+x+"/files"]) == |
49 |
> types.ListType: |
50 |
> + |
51 |
> myfiles.extend(self.settings["netboot2/packages/"+x+"/files"]) |
52 |
> + else: |
53 |
> + |
54 |
> myfiles.append(self.settings["netboot2/packages/"+x+"/files"]) |
55 |
> if "netboot2/extra_files" in self.settings: |
56 |
> if |
57 |
> type(self.settings["netboot2/extra_files"]) == types.ListType: |
58 |
|
59 |
good, I hadn't done much in netboot2, but I found it hard to spot those |
60 |
in there just now. I thought I had fixed them all otherwise. |
61 |
|
62 |
-- |
63 |
Brian Dolbec <dolsen> |