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 8AFC21382C5 for ; Sun, 27 Dec 2020 23:15:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6383E0DF2; Sun, 27 Dec 2020 23:15:26 +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 AE693E0DF2 for ; Sun, 27 Dec 2020 23:15:26 +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 CD27F340F69 for ; Sun, 27 Dec 2020 23:15:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31A18473 for ; Sun, 27 Dec 2020 23:15:22 +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: <1608346612.6ef1d63861248098654bd8f211f929f8c6b6c63b.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/embedded.py catalyst/targets/stage1.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 6ef1d63861248098654bd8f211f929f8c6b6c63b X-VCS-Branch: master Date: Sun, 27 Dec 2020 23:15:22 +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: 10832cba-609e-4872-ae64-410bfa32d597 X-Archives-Hash: ecc3e5be24314677949fc48ce46b9fe7 Message-ID: <20201227231522.ltaVXbgugzuhcLY7fr_lzAB-HfCKs7k-Fsi8QinLxlU@z> commit: 6ef1d63861248098654bd8f211f929f8c6b6c63b Author: Matt Turner gentoo org> AuthorDate: Sat Dec 19 01:58:42 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Dec 19 02:56:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6ef1d638 catalyst: Remove some redundant set_stage_path()s We only need to override root_path, and stage_path will be configured properly. Signed-off-by: Matt Turner gentoo.org> catalyst/targets/embedded.py | 5 ----- catalyst/targets/stage1.py | 5 ----- 2 files changed, 10 deletions(-) diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py index e9138437..918b36bf 100644 --- a/catalyst/targets/embedded.py +++ b/catalyst/targets/embedded.py @@ -65,11 +65,6 @@ class embedded(StageBase): "clear_autoresume", ]) - def set_stage_path(self): - self.settings["stage_path"] = normpath( - self.settings["chroot_path"]+"/tmp/mergeroot") - log.info('embedded stage path is %s', self.settings['stage_path']) - def set_root_path(self): self.settings["root_path"] = normpath("/tmp/mergeroot") log.info('embedded root path is %s', self.settings['root_path']) diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index be3eae93..5aa27bb9 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -23,11 +23,6 @@ class stage1(StageBase): def __init__(self, spec, addlargs): StageBase.__init__(self, spec, addlargs) - def set_stage_path(self): - self.settings["stage_path"] = normpath( - self.settings["chroot_path"]+self.settings["root_path"]) - log.notice('stage1 stage path is %s', self.settings['stage_path']) - def set_root_path(self): # sets the root path, relative to 'chroot_path', of the stage1 root self.settings["root_path"] = normpath("/tmp/stage1root")