[gentoo-commits] proj/catalyst:3.0 commit in: catalyst/, catalyst/base/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     0a33779ee771de6d1bbfbde21365cb961e62720a
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 04:07:20 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Apr 18 16:50:35 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0a33779e

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 02ccb37..0e9b84f 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