commit: a1efe958a133a49275b359e78cde0f222166cbcd
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 21:11:10 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 21:11:10 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a1efe958
stagebase: Run autopep8 to remove tabs
Fixes: 22f59e6d758b (Add "interpreter" parameter for qemu-user build support)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 49 +++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 22 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 345fe1db..df1cb844 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -939,23 +939,26 @@ class StageBase(TargetBase, ClearBase, GenBase):
shutil.copy('/etc/resolv.conf',
self.settings['chroot_path'] + '/etc/')
- # Copy over the binary interpreter (qemu), if
applicable; note that it's given
- # as full path and goes to the same place in the chroot
- if "interpreter" in self.settings:
- if not
os.path.exists(self.settings["interpreter"]):
- raise CatalystError(
- "Can't find interpreter " +
self.settings["interpreter"],
- print_traceback=True)
+ # Copy over the binary interpreter (qemu), if applicable; note
that it's given
+ # as full path and goes to the same place in the chroot
+ if "interpreter" in self.settings:
+ if not os.path.exists(self.settings["interpreter"]):
+ raise CatalystError(
+ "Can't find interpreter " +
+ self.settings["interpreter"],
+ print_traceback=True)
- log.notice('Copying binary interpreter %s into
chroot', self.settings['interpreter'])
+ log.notice('Copying binary interpreter %s into chroot',
+ self.settings['interpreter'])
- if os.path.exists(self.settings['chroot_path']
+ '/' + self.settings['interpreter']):
- os.rename(
- self.settings['chroot_path'] +
'/' + self.settings['interpreter'],
- self.settings['chroot_path'] +
'/' + self.settings['interpreter'] + '.catalyst')
+ if os.path.exists(self.settings['chroot_path'] + '/' +
self.settings['interpreter']):
+ os.rename(
+ self.settings['chroot_path'] +
+ '/' + self.settings['interpreter'],
+ self.settings['chroot_path'] + '/' +
self.settings['interpreter'] + '.catalyst')
- shutil.copy(self.settings['interpreter'],
- self.settings['chroot_path'] + '/' +
self.settings['interpreter'])
+ shutil.copy(self.settings['interpreter'],
+ self.settings['chroot_path'] + '/' +
self.settings['interpreter'])
# Copy over the envscript, if applicable
if "envscript" in self.settings:
@@ -1124,14 +1127,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
