1 |
commit: da56b3e0b3080dd592874e7076c69809b2657cfb |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 23 04:09:18 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 23 04:09:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=da56b3e0 |
7 |
|
8 |
catalyst: Fix indentation |
9 |
|
10 |
This code was initially committed with tabs and didn't work. I ran |
11 |
autopep8 on it but did not realize that the indentation was still |
12 |
incorrect. |
13 |
|
14 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
15 |
|
16 |
catalyst/base/stagebase.py | 20 ++++++++++---------- |
17 |
1 file changed, 10 insertions(+), 10 deletions(-) |
18 |
|
19 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
20 |
index be7b96c8..603e49d9 100644 |
21 |
--- a/catalyst/base/stagebase.py |
22 |
+++ b/catalyst/base/stagebase.py |
23 |
@@ -1132,16 +1132,16 @@ class StageBase(TargetBase, ClearBase, GenBase): |
24 |
if os.path.exists(hosts_file + '.catalyst'): |
25 |
os.rename(hosts_file + '.catalyst', hosts_file) |
26 |
|
27 |
- # optionally clean up binary interpreter |
28 |
- if "interpreter" in self.settings: |
29 |
- if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst'): |
30 |
- os.rename( |
31 |
- self.settings['chroot_path'] + '/' + |
32 |
- self.settings['interpreter'] + '.catalyst', |
33 |
- self.settings['chroot_path'] + '/' + self.settings['interpreter']) |
34 |
- else: |
35 |
- os.remove( |
36 |
- self.settings['chroot_path'] + '/' + self.settings['interpreter']) |
37 |
+ # optionally clean up binary interpreter |
38 |
+ if "interpreter" in self.settings: |
39 |
+ if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst'): |
40 |
+ os.rename( |
41 |
+ self.settings['chroot_path'] + '/' + |
42 |
+ self.settings['interpreter'] + '.catalyst', |
43 |
+ self.settings['chroot_path'] + '/' + self.settings['interpreter']) |
44 |
+ else: |
45 |
+ os.remove( |
46 |
+ self.settings['chroot_path'] + '/' + self.settings['interpreter']) |
47 |
|
48 |
# optionally clean up portage configs |
49 |
if ("portage_prefix" in self.settings and |