public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] [PATCH] lint: fix mixed indentation to only use tabs
Date: Mon, 5 Oct 2015 23:35:08 -0700	[thread overview]
Message-ID: <20151005233508.0f3bcbb8.dolsen@gentoo.org> (raw)
In-Reply-To: <1444104724-16584-1-git-send-email-vapier@gentoo.org>

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>



      reply	other threads:[~2015-10-06  6:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-06  4:12 [gentoo-catalyst] [PATCH] lint: fix mixed indentation to only use tabs Mike Frysinger
2015-10-06  6:35 ` Brian Dolbec [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151005233508.0f3bcbb8.dolsen@gentoo.org \
    --to=dolsen@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox