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 DEEA5138359 for ; Fri, 23 Oct 2020 04:50:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28099E08FC; Fri, 23 Oct 2020 04:50:23 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (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 D4D8BE08FC for ; Fri, 23 Oct 2020 04:50:22 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id 1so231109ple.2 for ; Thu, 22 Oct 2020 21:50:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pGT8W973FcQKfG0u8so3yi8W2vlAZZ+3RjFaDTnL8n8=; b=gT2hDRWbc9Kqdlh12W3zqE4uKiZTUzzeYc9/im8w4py54QCzVNWLdHaSCmi6nYVluJ +CMPObix2ShTAwqUWT3bOxdR+msucaTeHBDGmYM7TWcdwp3Nk+x6+gA4CWd3r02fp6yP cPSo+KUpbBI/R+912iStlhYroigZ/qvOAP1CoPVMHCVJOYzatfKzT8tQAkCYzc0uh1Gk 42hz6s9tcevaUIiWPAXfjwA/pGPt7hqcVSn8vf8uKbMg3taiUg12xpFjNp9+VlJ2jqPF nzsI/ba228kGOP2SdjYwSq3TLjmgjEniYPjUtCLaUIy5VN4tJxbsZKlAIIKaNRe4jdRa JWiw== X-Gm-Message-State: AOAM531UDermXAQy6ygVgmn5TQbtHCJwoC8jx1zl+el1/8QncYQjFbYU 49NHQlAIYmeF7vqHp4UkPzmdT+2nfyn8QA== X-Google-Smtp-Source: ABdhPJyZHBa5eBBjZ4C+LIxt8Gsyw2BoGJu4UK939RzstThpi+BCaHWKxFXtIBprxA8Eb2tG1LvDog== X-Received: by 2002:a17:902:8205:b029:d5:dc92:a1d4 with SMTP id x5-20020a1709028205b02900d5dc92a1d4mr477681pln.41.1603428621552; Thu, 22 Oct 2020 21:50:21 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id u4sm332967pjy.19.2020.10.22.21.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 21:50:20 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 1/5] catalyst: Fix indentation Date: Thu, 22 Oct 2020 21:50:14 -0700 Message-Id: <20201023045018.567245-1-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 6afb179c-278a-4f31-aa37-5c58a6a7117b X-Archives-Hash: f5e7f0eba948b829f88afd63ddc67acf 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 --- 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 -- 2.26.2