From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-475082-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1SfdF4-000215-NI
	for garchives@archives.gentoo.org; Fri, 15 Jun 2012 20:35:39 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5F3ADE0788;
	Fri, 15 Jun 2012 20:34:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 1EDC4E077A
	for <gentoo-commits@lists.gentoo.org>; Fri, 15 Jun 2012 20:34:29 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 3F3ED1B403D
	for <gentoo-commits@lists.gentoo.org>; Fri, 15 Jun 2012 20:34:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 08506E5430
	for <gentoo-commits@lists.gentoo.org>; Fri, 15 Jun 2012 20:34:28 +0000 (UTC)
From: "André Erdmann" <dywi@mailerd.de>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" <dywi@mailerd.de>
Message-ID: <1339699835.c335d96105c50c6f988ffac378a9d17ada050874.dywi@gentoo>
Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/
X-VCS-Repository: proj/R_overlay
X-VCS-Files: roverlay/config.py
X-VCS-Directories: roverlay/
X-VCS-Committer: dywi
X-VCS-Committer-Name: André Erdmann
X-VCS-Revision: c335d96105c50c6f988ffac378a9d17ada050874
X-VCS-Branch: master
Date: Fri, 15 Jun 2012 20:34:28 +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
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: ada1eac9-4118-48a9-b32b-370e007db2b7
X-Archives-Hash: 3707691b6b54a9b2cf3ee4acf49864d2

commit:     c335d96105c50c6f988ffac378a9d17ada050874
Author:     Andr=C3=A9 Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jun 14 18:50:35 2012 +0000
Commit:     Andr=C3=A9 Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jun 14 18:50:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git=
;a=3Dcommit;h=3Dc335d961

config

* fix get()/_findpath()
* add key/value injection

	modified:   roverlay/config.py

---
 roverlay/config.py |   74 ++++++++++++++++++++++++++++++++++++++++------=
------
 1 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/roverlay/config.py b/roverlay/config.py
index 3f6707b..abef63f 100644
--- a/roverlay/config.py
+++ b/roverlay/config.py
@@ -18,7 +18,7 @@ from roverlay          import const
 from roverlay.rpackage import descriptionfields
=20
=20
-
+CONFIG_INJECTION_IS_BAD =3D True
=20
 def access():
 	"""Returns the ConfigTree."""
@@ -26,7 +26,7 @@ def access():
 # --- end of access (...) ---
=20
=20
-def get ( key, fallback_value=3DNone ):
+def get ( key, fallback_value=3DNone, fail_if_unset=3DFalse ):
 	"""Searches for key in the ConfigTree and returns its value if possible=
,
 	else fallback_value.
 	'key' is a config path [<section>[.<subsection>*]]<option name>.
@@ -36,11 +36,14 @@ def get ( key, fallback_value=3DNone ):
 	* fallback_value --
 	"""
 	if not fallback_value is None:
-		return access().get ( key, fallback_value )
+		return access().get ( key, fallback_value, fail_if_unset )
 	else:
-		return access().get ( key )
+		return access().get ( key, fail_if_unset )
 # --- end of get (...) ---
=20
+def get_or_fail ( key ):
+	return access().get ( key, fail_if_unset=3DTrue )
+# --- end of get_or_fail (...) ---
=20
 class InitialLogger:
=20
@@ -82,6 +85,7 @@ class ConfigTree ( object ):
 	# ** fs_path -- ~ will be expanded
 	# ** fs_dir  -- fs_path and value must be a dir if it exists
 	# ** fs_file -- fs_path and value must be a file if it exists
+	# TODO** fs_prog -- fs_file (and fs_path) and value must be executable =
(TODO)
 	# ** regex   -- value is a regex and will be compiled (re.compile(..))
 	#
 	#   multiple types are generally not supported ('this is an int or a st=
r'),
@@ -115,6 +119,11 @@ class ConfigTree ( object ):
 		distfiles_dir =3D dict (
 			value_type =3D 'fs_dir',
 		),
+		ebuild_prog =3D dict (
+			path       =3D [ 'TOOLS', 'ebuild_prog' ],
+			value_type =3D 'fs_path',
+		),
+
 	)
=20
 	# often used regexes
@@ -168,12 +177,14 @@ class ConfigTree ( object ):
=20
 		config_position =3D self._config if root is None else root
=20
+		if config_position is None: return None
+
 		for k in path:
-			if not k in config_position:
+			if k =3D=3D path [-1] and not value is None:
+				# overwrite entry
+				config_position [k] =3D value
+			elif not k in config_position:
 				if create:
-					if k =3D=3D path [-1] and not value is None:
-						config_position [k] =3D value
-					else:
 						config_position [k] =3D dict()
 				else:
 					return None
@@ -184,8 +195,32 @@ class ConfigTree ( object ):
=20
 	# --- end of _findpath (...) ---
=20
+	def inject ( self, key, value, suppress_log=3DFalse ):
+		"""This method offer direct write access to the ConfigTree. No checks
+		will be performed, so make sure you know what you're doing.
+
+		arguments:
+		* key -- config path of the entry to-be-created/overwritten
+		          the whole path will be created, this operation does not fail
+		          if a path component is missing ('<root>.<new>.<entry> create=
s
+		          root, new and entry if required)
+		* value -- value to be assigned
+
+		returns: None (implicit)
+		"""
+		if not suppress_log:
+			msg =3D 'config injection: value %s will '\
+				'be assigned to config key %s ...' % ( value, key )
+
+			if CONFIG_INJECTION_IS_BAD:
+				self.logger.warning ( msg )
+			else:
+				self.logger.debug ( msg )
+
+		self._findpath ( key, create=3DTrue, value=3Dvalue )
+	# --- end of inject (...) ---
=20
-	def get ( self, key, fallback_value=3DNone ):
+	def get ( self, key, fallback_value=3DNone, fail_if_unset=3DFalse ):
 		"""Searches for key in the ConfigTree and returns its value.
 		Searches in const if ConfigTree does not contain the requested key and
 		returns the fallback_value if key not found.
@@ -193,17 +228,22 @@ class ConfigTree ( object ):
 		arguments:
 		* key --
 		* fallback_value --
+		* fail_if_unset -- fail if key is neither in config nor const
 		"""
-		if self._config:
-			config_value =3D self._findpath ( key )
=20
-			if config_value:
-				return config_value
+		config_value =3D self._findpath ( key )
+
+		if config_value is None:
+			fallback =3D None if fail_if_unset else fallback_value
+			if not self._const_imported:
+				config_value =3D const.lookup ( key, fallback )
+			else:
+				config_value =3D fallback
+
+			if config_value is None and fail_if_unset:
+				raise Exception ( "config key '%s' not found but required." % key )
=20
-		if self._const_imported:
-			return fallback_value
-		else:
-			return const.lookup ( key, fallback_value )
+		return config_value
=20
 	# --- end of get (...) ---
=20