From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E23B138359 for ; Sat, 15 Aug 2020 21:11:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8572E081B; Sat, 15 Aug 2020 21:11:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 987B0E081B for ; Sat, 15 Aug 2020 21:11:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32A8D34EFCD for ; Sat, 15 Aug 2020 21:11:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9080F2EE for ; Sat, 15 Aug 2020 21:11:51 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1597525870.a1efe958a133a49275b359e78cde0f222166cbcd.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a1efe958a133a49275b359e78cde0f222166cbcd X-VCS-Branch: master Date: Sat, 15 Aug 2020 21:11:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d5c612d5-25b1-41e1-b9e5-2798aca67b07 X-Archives-Hash: 777ee70fd569c1169cac6e7bf0c5a2f5 commit: a1efe958a133a49275b359e78cde0f222166cbcd Author: Matt Turner gentoo org> AuthorDate: Sat Aug 15 21:11:10 2020 +0000 Commit: Matt Turner gentoo 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 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