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

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

commit:     51c037ec3f153398db7f2e10c3c5961d328617b1
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul  5 15:50:15 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul  5 15:50:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=51c037ec

main script: --print-config

	modified:   main.py
	modified:   roverlay/argutil.py

---
 main.py             |   24 ++++++++++++++++++------
 roverlay/argutil.py |   12 +++++++++++-
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/main.py b/main.py
index a4f2227..df76b32 100755
--- a/main.py
+++ b/main.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import os
 import sys
 
 # roverlay modules will be imported later
@@ -7,11 +8,11 @@ import sys
 HIDE_EXCEPTIONS = False
 
 class DIE ( object ):
-	NOP          =   0
-	ERR          =   1
-	BAD_USAGE    =   3
-	ARG          =   9
-	CONFIG       =  10
+	NOP          =  os.EX_OK
+	ERR          =  1
+	BAD_USAGE    =  os.EX_USAGE
+	ARG          =  9
+	CONFIG       =  os.EX_CONFIG
 	OV_CREATE    =  20
 	SYNC         =  30
 	CMD_LEFTOVER =  90
@@ -74,7 +75,10 @@ except ImportError:
 		raise
 
 try:
-	roverlay.load_config_file ( config_file, extraconf=additional_config )
+	conf = roverlay.load_config_file (
+		config_file,
+		extraconf=additional_config
+	)
 	del config_file, additional_config
 except:
 	if HIDE_EXCEPTIONS:
@@ -82,6 +86,14 @@ except:
 	else:
 		raise
 
+if OPTION ( 'print_config' ):
+	try:
+		conf.visualize ( into=sys.stdout )
+	except:
+		die ( "Cannot print config!" )
+	sys.exit ( os.EX_OK )
+
+
 # -- determine commands to run
 # (TODO) could replace this section when adding more actions
 

diff --git a/roverlay/argutil.py b/roverlay/argutil.py
index 8e37694..540743a 100644
--- a/roverlay/argutil.py
+++ b/roverlay/argutil.py
@@ -151,12 +151,21 @@ def get_parser ( CMD_DESC, DEFAULT_CONFIG ):
 		**opt_in
 	)
 
+	arg (
+		'--print-config', '--pc',
+		help="print config and exit",
+		**opt_in
+	)
+
+	# --write-desc
+	# --log-level, --log-console, --log...
+
 	# TODO
 	arg (
 		'--debug',
 		help='''
 			Turn on debugging. This produces a lot of messages.
-			(TODO: always on).
+			(TODO: has no effect).
 		''',
 		**opt_in
 	)
@@ -200,6 +209,7 @@ def parse_argv ( *args, **kw ):
 		show_overlay   = p.show_overlay,
 		write_overlay  = p.write_overlay,
 		print_stats    = p.stats,
+		print_config   = p.print_config,
 		force_distroot = p.force_distroot,
 	)