[gentoo-commits] proj/R_overlay:master commit in: roverlay/

["André Erdmann" <dywi@mailerd.de>]

commit:     6bd75daf93e1efbe1372dc908cd998a2a96299d3
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 15 09:51:28 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 15 09:51:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=6bd75daf

add get_distdir() to util

---
 roverlay/util.py |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/roverlay/util.py b/roverlay/util.py
index 6547906..12561f7 100644
--- a/roverlay/util.py
+++ b/roverlay/util.py
@@ -50,15 +50,21 @@ def get_packageinfo ( filepath ):
 # --- end of get_packageinfo (...) ---
 
 def get_extra_packageinfo ( package_info, name ):
-	return dict (
-		PKG_DISTDIR = os.path.dirname ( package_info ['package_file'] ),
-		EBUILD_FILE = os.path.join (
+	#name = name.upper()
+	ret = None
+	if name == 'PKG_DISTDIR':
+		ret = PKG_DISTDIR = os.path.dirname ( package_info ['package_file'] )
+	elif name == 'EBUILD_FILE':
+		ret = os.path.join (
 			config.get_or_fail ( [ 'OVERLAY', 'dir' ] ),
 			config.get_or_fail ( [ 'OVERLAY', 'category' ] ),
 			package_info [ 'ebuild_filename'].partition ( '-' ) [0],
 			package_info [ 'ebuild_filename'] + ".ebuild"
 		)
-	) [name]
+	else:
+		raise Exception ( "unknown package info requested." )
+
+	return ret
 # --- end of get_extra_packageinfo (...) ---
 
 def pipe_lines ( _pipe, use_filter=False, filter_func=None ):
@@ -69,6 +75,15 @@ def pipe_lines ( _pipe, use_filter=False, filter_func=None ):
 		return lines
 # --- end of pipe_lines (...) ---
 
+def get_distdir ( repo_name='' ):
+	distdir = config.get ( [ 'DISTFILES', 'REPO', repo_name ], fallback_value=None )
+	if distdir is None:
+		distdir = config.get_or_fail ( [ 'DISTFILES', 'root' ] )
+		if len ( repo_name ) > 0:
+			distdir = os.path.join ( distdir, repo_name )
+
+	return distdir
+
 
 def keepenv ( *to_keep, local_env=None ):
 	if local_env is None: