| 1 |
commit: a1efe958a133a49275b359e78cde0f222166cbcd |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 15 21:11:10 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 15 21:11:10 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a1efe958 |
| 7 |
|
| 8 |
stagebase: Run autopep8 to remove tabs |
| 9 |
|
| 10 |
Fixes: 22f59e6d758b (Add "interpreter" parameter for qemu-user build support) |
| 11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 12 |
|
| 13 |
catalyst/base/stagebase.py | 49 +++++++++++++++++++++++++--------------------- |
| 14 |
1 file changed, 27 insertions(+), 22 deletions(-) |
| 15 |
|
| 16 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 17 |
index 345fe1db..df1cb844 100644 |
| 18 |
--- a/catalyst/base/stagebase.py |
| 19 |
+++ b/catalyst/base/stagebase.py |
| 20 |
@@ -939,23 +939,26 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 21 |
shutil.copy('/etc/resolv.conf', |
| 22 |
self.settings['chroot_path'] + '/etc/') |
| 23 |
|
| 24 |
- # Copy over the binary interpreter (qemu), if applicable; note that it's given |
| 25 |
- # as full path and goes to the same place in the chroot |
| 26 |
- if "interpreter" in self.settings: |
| 27 |
- if not os.path.exists(self.settings["interpreter"]): |
| 28 |
- raise CatalystError( |
| 29 |
- "Can't find interpreter " + self.settings["interpreter"], |
| 30 |
- print_traceback=True) |
| 31 |
+ # Copy over the binary interpreter (qemu), if applicable; note that it's given |
| 32 |
+ # as full path and goes to the same place in the chroot |
| 33 |
+ if "interpreter" in self.settings: |
| 34 |
+ if not os.path.exists(self.settings["interpreter"]): |
| 35 |
+ raise CatalystError( |
| 36 |
+ "Can't find interpreter " + |
| 37 |
+ self.settings["interpreter"], |
| 38 |
+ print_traceback=True) |
| 39 |
|
| 40 |
- log.notice('Copying binary interpreter %s into chroot', self.settings['interpreter']) |
| 41 |
+ log.notice('Copying binary interpreter %s into chroot', |
| 42 |
+ self.settings['interpreter']) |
| 43 |
|
| 44 |
- if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter']): |
| 45 |
- os.rename( |
| 46 |
- self.settings['chroot_path'] + '/' + self.settings['interpreter'], |
| 47 |
- self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst') |
| 48 |
+ if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter']): |
| 49 |
+ os.rename( |
| 50 |
+ self.settings['chroot_path'] + |
| 51 |
+ '/' + self.settings['interpreter'], |
| 52 |
+ self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst') |
| 53 |
|
| 54 |
- shutil.copy(self.settings['interpreter'], |
| 55 |
- self.settings['chroot_path'] + '/' + self.settings['interpreter']) |
| 56 |
+ shutil.copy(self.settings['interpreter'], |
| 57 |
+ self.settings['chroot_path'] + '/' + self.settings['interpreter']) |
| 58 |
|
| 59 |
# Copy over the envscript, if applicable |
| 60 |
if "envscript" in self.settings: |
| 61 |
@@ -1124,14 +1127,16 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 62 |
if os.path.exists(hosts_file + '.catalyst'): |
| 63 |
os.rename(hosts_file + '.catalyst', hosts_file) |
| 64 |
|
| 65 |
- # optionally clean up binary interpreter |
| 66 |
- if "interpreter" in self.settings: |
| 67 |
- if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst'): |
| 68 |
- os.rename( |
| 69 |
- self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst', |
| 70 |
- self.settings['chroot_path'] + '/' + self.settings['interpreter']) |
| 71 |
- else: |
| 72 |
- os.remove(self.settings['chroot_path'] + '/' + self.settings['interpreter']) |
| 73 |
+ # optionally clean up binary interpreter |
| 74 |
+ if "interpreter" in self.settings: |
| 75 |
+ if os.path.exists(self.settings['chroot_path'] + '/' + self.settings['interpreter'] + '.catalyst'): |
| 76 |
+ os.rename( |
| 77 |
+ self.settings['chroot_path'] + '/' + |
| 78 |
+ self.settings['interpreter'] + '.catalyst', |
| 79 |
+ self.settings['chroot_path'] + '/' + self.settings['interpreter']) |
| 80 |
+ else: |
| 81 |
+ os.remove( |
| 82 |
+ self.settings['chroot_path'] + '/' + self.settings['interpreter']) |
| 83 |
|
| 84 |
# optionally clean up portage configs |
| 85 |
if ("portage_prefix" in self.settings and |
Archives