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 DAFD6138359 for ; Fri, 23 Oct 2020 04:36:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 059AAE08FB; Fri, 23 Oct 2020 04:36:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D7BAEE08F9 for ; Fri, 23 Oct 2020 04:36:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 89A7C33FEF1 for ; Fri, 23 Oct 2020 04:36:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8717D3A7 for ; Fri, 23 Oct 2020 04:36:41 +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: <1603426158.da56b3e0b3080dd592874e7076c69809b2657cfb.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 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: da56b3e0b3080dd592874e7076c69809b2657cfb X-VCS-Branch: pending/mattst88 Date: Fri, 23 Oct 2020 04:36:41 +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: be32999c-4b4c-446c-bf82-f223785a8369 X-Archives-Hash: a5349a50b34a33b689aecc95d1e0b9fa Message-ID: <20201023043641.MjZYWTn2rVortRIIgftENVYIdTF3cQFl7DR-uIOYlnM@z> commit: da56b3e0b3080dd592874e7076c69809b2657cfb Author: Matt Turner gentoo org> AuthorDate: Fri Oct 23 04:09:18 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Oct 23 04:09:18 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=da56b3e0 catalyst: Fix indentation This code was initially committed with tabs and didn't work. I ran autopep8 on it but did not realize that the indentation was still incorrect. Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index be7b96c8..603e49d9 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1132,16 +1132,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