| 1 |
commit: e10cdc703dddf4caa7990674a59ecdb0e40a8807 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 6 04:11:56 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 6 04:11:56 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e10cdc70 |
| 7 |
|
| 8 |
lint: fix mixed indentation to only use tabs |
| 9 |
|
| 10 |
catalyst/base/stagebase.py | 4 ++-- |
| 11 |
catalyst/targets/netboot2.py | 8 ++++---- |
| 12 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 13 |
|
| 14 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 15 |
index 432ad5c..a9e7848 100644 |
| 16 |
--- a/catalyst/base/stagebase.py |
| 17 |
+++ b/catalyst/base/stagebase.py |
| 18 |
@@ -24,9 +24,9 @@ from catalyst.fileops import ensure_dirs, pjoin |
| 19 |
from catalyst.base.resume import AutoResume |
| 20 |
|
| 21 |
if sys.version_info[0] >= 3: |
| 22 |
- py_input = input |
| 23 |
+ py_input = input |
| 24 |
else: |
| 25 |
- py_input = raw_input |
| 26 |
+ py_input = raw_input |
| 27 |
|
| 28 |
|
| 29 |
class StageBase(TargetBase, ClearBase, GenBase): |
| 30 |
|
| 31 |
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py |
| 32 |
index 5de1a74..e509cf9 100644 |
| 33 |
--- a/catalyst/targets/netboot2.py |
| 34 |
+++ b/catalyst/targets/netboot2.py |
| 35 |
@@ -80,10 +80,10 @@ class netboot2(StageBase): |
| 36 |
|
| 37 |
for x in loopy: |
| 38 |
if "netboot2/packages/"+x+"/files" in self.settings: |
| 39 |
- if type(self.settings["netboot2/packages/"+x+"/files"]) == types.ListType: |
| 40 |
- myfiles.extend(self.settings["netboot2/packages/"+x+"/files"]) |
| 41 |
- else: |
| 42 |
- myfiles.append(self.settings["netboot2/packages/"+x+"/files"]) |
| 43 |
+ if type(self.settings["netboot2/packages/"+x+"/files"]) == types.ListType: |
| 44 |
+ myfiles.extend(self.settings["netboot2/packages/"+x+"/files"]) |
| 45 |
+ else: |
| 46 |
+ myfiles.append(self.settings["netboot2/packages/"+x+"/files"]) |
| 47 |
|
| 48 |
if "netboot2/extra_files" in self.settings: |
| 49 |
if type(self.settings["netboot2/extra_files"]) == types.ListType: |
Archives