From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-catalyst+bounces-3278-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 2999513888F
for <garchives@archives.gentoo.org>; Tue, 6 Oct 2015 15:05:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6042821C02A;
Tue, 6 Oct 2015 15:05:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9218321C022
for <gentoo-catalyst@lists.gentoo.org>; Tue, 6 Oct 2015 15:05:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by smtp.gentoo.org (Postfix) with ESMTP id B6B2A340ACE
for <gentoo-catalyst@lists.gentoo.org>; Tue, 6 Oct 2015 15:05:34 +0000 (UTC)
From: Mike Frysinger <vapier@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] [PATCH 03/13] lint: fix bad indentation
Date: Tue, 6 Oct 2015 11:05:19 -0400
Message-Id: <1444143929-26705-3-git-send-email-vapier@gentoo.org>
X-Mailer: git-send-email 2.5.2
In-Reply-To: <1444143929-26705-1-git-send-email-vapier@gentoo.org>
References: <1444143929-26705-1-git-send-email-vapier@gentoo.org>
Precedence: bulk
List-Post: <mailto:gentoo-catalyst@lists.gentoo.org>
List-Help: <mailto:gentoo-catalyst+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-catalyst+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-catalyst+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-catalyst.gentoo.org>
X-BeenThere: gentoo-catalyst@lists.gentoo.org
Reply-to: gentoo-catalyst@lists.gentoo.org
X-Archives-Salt: 732fd8f9-bf6f-4b0e-9b8b-39f2d146638c
X-Archives-Hash: 121805ccc10a979597b3a40aea8296d2
Fix code that has excessive indentation relative to previous levels.
---
catalyst/arch/x86.py | 4 ++--
catalyst/base/stagebase.py | 6 +++---
catalyst/targets/livecd_stage1.py | 2 +-
catalyst/targets/livecd_stage2.py | 2 +-
catalyst/targets/netboot2.py | 4 ++--
catalyst/targets/stage2.py | 12 ++++++------
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index 49500b9..33b29c0 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -10,8 +10,8 @@ class generic_x86(builder.generic):
builder.generic.__init__(self,myspec)
if self.settings["buildarch"]=="amd64":
if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
- raise CatalystError("required executable linux32 not found "
- "(\"emerge setarch\" to fix.)", print_traceback=True)
+ raise CatalystError("required executable linux32 not found "
+ "(\"emerge setarch\" to fix.)", print_traceback=True)
self.settings["CHROOT"]="linux32 chroot"
self.settings["crosscompile"] = False
else:
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a9e7848..b9dd1d5 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -853,9 +853,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
and os.path.exists(target_portdir) \
and self.resume.is_enabled("unpack_portage") \
and self.settings["snapshot_path_hash"] == snapshot_hash:
- print \
- "Valid Resume point detected, skipping unpack of portage tree..."
- unpack=False
+ print \
+ "Valid Resume point detected, skipping unpack of portage tree..."
+ unpack = False
if unpack:
if "snapcache" in self.settings["options"]:
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
index ff320c0..262db70 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -34,7 +34,7 @@ class livecd_stage1(StageBase):
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
- print "Resume point detected, skipping target path setup operation..."
+ print "Resume point detected, skipping target path setup operation..."
else:
# first clean up any existing target stuff
if os.path.exists(self.settings["target_path"]):
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 870dcf9..b54f2f0 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -55,7 +55,7 @@ class livecd_stage2(StageBase):
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
- print "Resume point detected, skipping target path setup operation..."
+ print "Resume point detected, skipping target path setup operation..."
else:
# first clean up any existing target stuff
if os.path.isdir(self.settings["target_path"]):
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py
index e509cf9..f2d039c 100644
--- a/catalyst/targets/netboot2.py
+++ b/catalyst/targets/netboot2.py
@@ -54,7 +54,7 @@ class netboot2(StageBase):
self.settings["target_subpath"])
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
- print "Resume point detected, skipping target path setup operation..."
+ print "Resume point detected, skipping target path setup operation..."
else:
# first clean up any existing target stuff
if os.path.isfile(self.settings["target_path"]):
@@ -70,7 +70,7 @@ class netboot2(StageBase):
# check for autoresume point
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("copy_files_to_image"):
- print "Resume point detected, skipping target path setup operation..."
+ print "Resume point detected, skipping target path setup operation..."
else:
if "netboot2/packages" in self.settings:
if type(self.settings["netboot2/packages"]) == types.StringType:
diff --git a/catalyst/targets/stage2.py b/catalyst/targets/stage2.py
index 40dc938..affa2cb 100644
--- a/catalyst/targets/stage2.py
+++ b/catalyst/targets/stage2.py
@@ -56,9 +56,9 @@ class stage2(StageBase):
self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"])
def set_portage_overlay(self):
- StageBase.set_portage_overlay(self)
- if "portage_overlay" in self.settings:
- print "\nWARNING !!!!!"
- print "\tUsing an portage overlay for earlier stages could cause build issues."
- print "\tIf you break it, you buy it. Don't complain to us about it."
- print "\tDont say we did not warn you\n"
+ StageBase.set_portage_overlay(self)
+ if "portage_overlay" in self.settings:
+ print "\nWARNING !!!!!"
+ print "\tUsing an portage overlay for earlier stages could cause build issues."
+ print "\tIf you break it, you buy it. Don't complain to us about it."
+ print "\tDont say we did not warn you\n"
--
2.5.2