From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AEC62138247 for ; Wed, 22 Jan 2014 05:04:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 997D6E1191; Wed, 22 Jan 2014 05:04:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0659E1191 for ; Wed, 22 Jan 2014 05:04:15 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1AA5D33FAF2 for ; Wed, 22 Jan 2014 05:04:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9F2BC187B7 for ; Wed, 22 Jan 2014 05:04:12 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1390364929.a6e39695fec360dce3612e8b3f00ff0cc9fec4d0.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 commit in: catalyst/, catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/defaults.py X-VCS-Directories: catalyst/ catalyst/base/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: a6e39695fec360dce3612e8b3f00ff0cc9fec4d0 X-VCS-Branch: 3.0 Date: Wed, 22 Jan 2014 05:04:12 +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-Archives-Salt: a3b44b84-aff8-40d7-9f68-1e5afe301d2c X-Archives-Hash: bf3efbbc77472fd667b99f891808d130 commit: a6e39695fec360dce3612e8b3f00ff0cc9fec4d0 Author: Brian Dolbec gentoo org> AuthorDate: Wed Jan 22 04:07:20 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Wed Jan 22 04:28:49 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a6e39695 Rename target_mounts, devpts and sort members. --- catalyst/base/stagebase.py | 8 +++++--- catalyst/defaults.py | 14 +++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index f42d943..fd7fda5 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -13,11 +13,12 @@ from catalyst.support import (CatalystError, msg, file_locate, normpath, from catalyst.base.targetbase import TargetBase from catalyst.base.clearbase import ClearBase from catalyst.base.genbase import GenBase -from catalyst.defaults import target_mounts +from catalyst.defaults import TARGET_MOUNT_DEFAULTS from catalyst.lock import LockDir from catalyst.fileops import ensure_dirs, pjoin from catalyst.base.resume import AutoResume + class StageBase(TargetBase, ClearBase, GenBase): """ This class does all of the chroot setup, copying of files, etc. It is @@ -191,7 +192,8 @@ class StageBase(TargetBase, ClearBase, GenBase): file_locate(self.settings,["portage_confdir"],expand=0) """ Setup our mount points """ - self.target_mounts = target_mounts.copy() + # initialize our target mounts. + self.target_mounts = TARGET_MOUNT_DEFAULTS.copy() if "snapcache" in self.settings["options"]: self.mounts=["proc", "dev", 'portdir', 'distdir', 'port_tmpdir'] self.mountmap={"proc":"/proc", "dev":"/dev", "pts":"/dev/pts", @@ -202,7 +204,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.mountmap={"proc":"/proc", "dev":"/dev", "pts":"/dev/pts", "distdir":self.settings["distdir"], "port_tmpdir":"tmpfs"} if os.uname()[0] == "Linux": - self.mounts.append("pts") + self.mounts.append("devpts") self.set_mounts() diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 0b98d83..11cecb3 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -80,18 +80,18 @@ confdefaults={ } -target_mounts = { - "proc": "/proc", +TARGET_MOUNT_DEFAULTS = { + "ccache": "/var/tmp/ccache", "dev": "/dev", - "pts": "/dev/pts", - "portdir": "/usr/portage", + "devpts": "/dev/pts", "distdir": "/usr/portage/distfiles", + "icecream": "/usr/lib/icecc/bin", + "kerncache": "/tmp/kerncache", "packagedir": "/usr/portage/packages", + "portdir": "/usr/portage", "port_tmpdir": "/var/tmp/portage", - "kerncache": "/tmp/kerncache", - "ccache": "/var/tmp/ccache", - "icecream": "/var/cache/icecream", "port_logdir": "/var/log/portage", + "proc": "/proc", } # legend: key: message