From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1232698-garchives=archives.gentoo.org@lists.gentoo.org>
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 A268F1382C5
for <garchives@archives.gentoo.org>; Sat, 19 Dec 2020 19:56:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 17CC72BC027;
Sat, 19 Dec 2020 19:56:08 +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 EE2572BC025
for <gentoo-commits@lists.gentoo.org>; Sat, 19 Dec 2020 19:56:07 +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 E3668341044
for <gentoo-commits@lists.gentoo.org>; Sat, 19 Dec 2020 19:56:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 351F746F
for <gentoo-commits@lists.gentoo.org>; Sat, 19 Dec 2020 19:56:03 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
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" <mattst88@gentoo.org>
Message-ID: <1608346612.6ef1d63861248098654bd8f211f929f8c6b6c63b.mattst88@gentoo>
Subject: [gentoo-commits] proj/catalyst:wip/mattst88 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: wip/mattst88
Date: Sat, 19 Dec 2020 19:56:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: df0ab67e-31cc-4707-8a8c-564767636340
X-Archives-Hash: 2e2f2258c19f3cddb9fcf5f6db983288
Message-ID: <20201219195603.2OJy3YXcMDJqBUB0KhasvoRJh43x0OTowlsXi6BON6I@z>
commit: 6ef1d63861248098654bd8f211f929f8c6b6c63b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 01:58:42 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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")