public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-catalyst] [PATCH 1/5] catalyst: Fix indentation
@ 2020-10-23  4:50 Matt Turner
  2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 2/5] catalyst: Drop stray vim modeline Matt Turner
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Matt Turner @ 2020-10-23  4:50 UTC (permalink / raw
  To: gentoo-catalyst; +Cc: Matt Turner

This code was initially committed with tabs and didn't work. I ran
autopep8 on it but did not realize that the indentation was still
incorrect.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 catalyst/base/stagebase.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index be7b96c8..603e49d9 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1132,16 +1132,16 @@ class StageBase(TargetBase, ClearBase, GenBase):
         if os.path.exists(hosts_file + '.catalyst'):
             os.rename(hosts_file + '.catalyst', hosts_file)
 
-            # optionally clean up binary interpreter
-            if "interpreter" in self.settings:
-                    if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst'):
-                        os.rename(
-                            self.settings['chroot_path'] + '/' +
-                            self.settings['interpreter'] + '.catalyst',
-                            self.settings['chroot_path'] + '/' + self.settings['interpreter'])
-                    else:
-                        os.remove(
-                            self.settings['chroot_path'] + '/' + self.settings['interpreter'])
+        # optionally clean up binary interpreter
+        if "interpreter" in self.settings:
+            if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst'):
+                os.rename(
+                    self.settings['chroot_path'] + '/' +
+                    self.settings['interpreter'] + '.catalyst',
+                    self.settings['chroot_path'] + '/' + self.settings['interpreter'])
+            else:
+                os.remove(
+                    self.settings['chroot_path'] + '/' + self.settings['interpreter'])
 
         # optionally clean up portage configs
         if ("portage_prefix" in self.settings and
-- 
2.26.2



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-10-23  4:50 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-23  4:50 [gentoo-catalyst] [PATCH 1/5] catalyst: Fix indentation Matt Turner
2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 2/5] catalyst: Drop stray vim modeline Matt Turner
2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 3/5] catalyst: Drop useless stage3 set_cleanables() Matt Turner
2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 4/5] catalyst: Explicitly keep /etc/resolv.conf in stage4 Matt Turner
2020-10-23  4:50 ` [gentoo-catalyst] [PATCH 5/5] catalyst: Don't delete /usr/share/zoneinfo from stage1 Matt Turner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox