[gentoo-catalyst] [PATCH] lint: fix mixed indentation to only use tabs

[gentoo-catalyst] [PATCH] lint: fix mixed indentation to only use tabs

[Mike Frysinger]

---
 catalyst/base/stagebase.py   | 4 ++--
 catalyst/targets/netboot2.py | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 432ad5c..a9e7848 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -24,9 +24,9 @@ from catalyst.fileops import ensure_dirs, pjoin
 from catalyst.base.resume import AutoResume
 
 if sys.version_info[0] >= 3:
-    py_input = input
+	py_input = input
 else:
-    py_input = raw_input
+	py_input = raw_input
 
 
 class StageBase(TargetBase, ClearBase, GenBase):
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py
index 5de1a74..e509cf9 100644
--- a/catalyst/targets/netboot2.py
+++ b/catalyst/targets/netboot2.py
@@ -80,10 +80,10 @@ class netboot2(StageBase):
 
 			for x in loopy:
 				if "netboot2/packages/"+x+"/files" in self.settings:
-				    if type(self.settings["netboot2/packages/"+x+"/files"]) == types.ListType:
-					    myfiles.extend(self.settings["netboot2/packages/"+x+"/files"])
-				    else:
-					    myfiles.append(self.settings["netboot2/packages/"+x+"/files"])
+					if type(self.settings["netboot2/packages/"+x+"/files"]) == types.ListType:
+						myfiles.extend(self.settings["netboot2/packages/"+x+"/files"])
+					else:
+						myfiles.append(self.settings["netboot2/packages/"+x+"/files"])
 
 			if "netboot2/extra_files" in self.settings:
 				if type(self.settings["netboot2/extra_files"]) == types.ListType:
-- 
2.5.2

Re: [gentoo-catalyst] [PATCH] lint: fix mixed indentation to only use tabs

[Brian Dolbec]

On Tue,  6 Oct 2015 00:12:04 -0400
Mike Frysinger <vapier@gentoo.org> wrote:

> ---
>  catalyst/base/stagebase.py   | 4 ++--
>  catalyst/targets/netboot2.py | 8 ++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
> index 432ad5c..a9e7848 100644
> --- a/catalyst/base/stagebase.py
> +++ b/catalyst/base/stagebase.py
> @@ -24,9 +24,9 @@ from catalyst.fileops import ensure_dirs, pjoin
>  from catalyst.base.resume import AutoResume
>  
>  if sys.version_info[0] >= 3:
> -    py_input = input
> +	py_input = input
>  else:
> -    py_input = raw_input
> +	py_input = raw_input
>  
> 

Ah, my quick copy/paste recently to add a debug pause for Rick to help
debug an issue.

 
>  class StageBase(TargetBase, ClearBase, GenBase):
> diff --git a/catalyst/targets/netboot2.py
> b/catalyst/targets/netboot2.py index 5de1a74..e509cf9 100644
> --- a/catalyst/targets/netboot2.py
> +++ b/catalyst/targets/netboot2.py
> @@ -80,10 +80,10 @@ class netboot2(StageBase):
>  
>  			for x in loopy:
>  				if "netboot2/packages/"+x+"/files"
> in self.settings:
> -				    if
> type(self.settings["netboot2/packages/"+x+"/files"]) ==
> types.ListType:
> -
> myfiles.extend(self.settings["netboot2/packages/"+x+"/files"])
> -				    else:
> -
> myfiles.append(self.settings["netboot2/packages/"+x+"/files"])
> +					if
> type(self.settings["netboot2/packages/"+x+"/files"]) ==
> types.ListType:
> +
> myfiles.extend(self.settings["netboot2/packages/"+x+"/files"])
> +					else:
> +
> myfiles.append(self.settings["netboot2/packages/"+x+"/files"]) 
>  			if "netboot2/extra_files" in self.settings:
>  				if
> type(self.settings["netboot2/extra_files"]) == types.ListType:

good, I hadn't done much in netboot2, but I found it hard to spot those
in there just now.  I thought I had fixed them all otherwise.

-- 
Brian Dolbec <dolsen>