Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 1/5] catalyst: Fix indentation
Date: Fri, 23 Oct 2020 04:50:23
Message-Id: 20201023045018.567245-1-mattst88@gentoo.org
1 This code was initially committed with tabs and didn't work. I ran
2 autopep8 on it but did not realize that the indentation was still
3 incorrect.
4
5 Signed-off-by: Matt Turner <mattst88@g.o>
6 ---
7 catalyst/base/stagebase.py | 20 ++++++++++----------
8 1 file changed, 10 insertions(+), 10 deletions(-)
9
10 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
11 index be7b96c8..603e49d9 100644
12 --- a/catalyst/base/stagebase.py
13 +++ b/catalyst/base/stagebase.py
14 @@ -1132,16 +1132,16 @@ class StageBase(TargetBase, ClearBase, GenBase):
15 if os.path.exists(hosts_file + '.catalyst'):
16 os.rename(hosts_file + '.catalyst', hosts_file)
17
18 - # optionally clean up binary interpreter
19 - if "interpreter" in self.settings:
20 - if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst'):
21 - os.rename(
22 - self.settings['chroot_path'] + '/' +
23 - self.settings['interpreter'] + '.catalyst',
24 - self.settings['chroot_path'] + '/' + self.settings['interpreter'])
25 - else:
26 - os.remove(
27 - self.settings['chroot_path'] + '/' + self.settings['interpreter'])
28 + # optionally clean up binary interpreter
29 + if "interpreter" in self.settings:
30 + if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst'):
31 + os.rename(
32 + self.settings['chroot_path'] + '/' +
33 + self.settings['interpreter'] + '.catalyst',
34 + self.settings['chroot_path'] + '/' + self.settings['interpreter'])
35 + else:
36 + os.remove(
37 + self.settings['chroot_path'] + '/' + self.settings['interpreter'])
38
39 # optionally clean up portage configs
40 if ("portage_prefix" in self.settings and
41 --
42 2.26.2

Replies