diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-08-15 14:11:10 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-08-15 14:11:10 -0700 |
| commit | a1efe958a133a49275b359e78cde0f222166cbcd (patch) | |
| tree | 7cb4186d56a9b6fbcda8977aa36a06decf4f8bde | |
| parent | targets: Use GRUB for BIOS boot (diff) | |
| download | catalyst-a1efe958a133a49275b359e78cde0f222166cbcd.tar.gz catalyst-a1efe958a133a49275b359e78cde0f222166cbcd.tar.bz2 catalyst-a1efe958a133a49275b359e78cde0f222166cbcd.zip | |
stagebase: Run autopep8 to remove tabs
Fixes: 22f59e6d758b (Add "interpreter" parameter for qemu-user build support)
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | catalyst/base/stagebase.py | 49 |
1 files 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 |