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

[André Erdmann]

commit:     8119905e27e78619ea226205d20874f220f5bb37
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul  6 22:14:41 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul  6 22:14:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8119905e

main script: --help-config, --overlay

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

---
 main.py             |   29 ++++++++++++++++++++++++++---
 roverlay/argutil.py |   19 +++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index df76b32..ce1189f 100755
--- a/main.py
+++ b/main.py
@@ -26,7 +26,7 @@ class DIE ( object ):
 		if msg is not None:
 			sys.stderr.write ( msg + "\n" )
 #		else:
-#			sys.stderr.write ( "died." )
+#			sys.stderr.write ( "died.\n" )
 		sys.exit ( code )
 	# --- end of die (...) ---
 
@@ -39,6 +39,9 @@ if __name__ != '__main__':
 
 
 # get args
+# imports roverlay.argutil (deleted when done)
+
+
 try:
 	import roverlay.argutil
 except ImportError:
@@ -49,7 +52,8 @@ except ImportError:
 
 COMMAND_DESCRIPTION = {
 	'sync'           : 'sync repos',
-	'create'         : 'create the overlay',
+	'create'         : 'create the overlay '
+	                    '(implies sync, override with --nosync)',
 #	'depres_console' : 'run an interactive depres console; TODO/REMOVE',
 	'nop'            : 'does nothing',
 }
@@ -66,6 +70,8 @@ del roverlay.argutil
 
 # -- load config
 
+# imports: roverlay, roverlay.config.entryutil (if --help-config)
+
 try:
 	import roverlay
 except ImportError:
@@ -82,20 +88,36 @@ try:
 	del config_file, additional_config
 except:
 	if HIDE_EXCEPTIONS:
-		die ( "Cannot load config file %r." % config_file, DIE.CONFIG )
+		die ( "Cannot load config file {!r}.".format ( config_file ), DIE.CONFIG )
 	else:
 		raise
 
+if OPTION ( 'list_config' ):
+	try:
+		from roverlay.config.entryutil import list_entries
+		print ( "== main config file ==\n" )
+		print ( list_entries() )
+	except:
+		raise
+		die ( "Cannot list config entries!" )
+
+	EXIT_AFTER_CONFIG = True
+
 if OPTION ( 'print_config' ):
 	try:
 		conf.visualize ( into=sys.stdout )
 	except:
 		die ( "Cannot print config!" )
+	EXIT_AFTER_CONFIG = True
+
+
+if 'EXIT_AFTER_CONFIG' in locals() and EXIT_AFTER_CONFIG:
 	sys.exit ( os.EX_OK )
 
 
 # -- determine commands to run
 # (TODO) could replace this section when adding more actions
+# imports roverlay.remote, roverlay.overlay.creator
 
 actions = set ( filter ( lambda x : x != 'nop', commands ) )
 
@@ -124,6 +146,7 @@ except ImportError:
 
 
 # -- run methods (and some vars)
+# imports: nothing
 
 actions_done = set()
 set_action_done = actions_done.add

diff --git a/roverlay/argutil.py b/roverlay/argutil.py
index 540743a..4750d15 100644
--- a/roverlay/argutil.py
+++ b/roverlay/argutil.py
@@ -113,6 +113,14 @@ def get_parser ( CMD_DESC, DEFAULT_CONFIG ):
 	)
 
 	arg (
+		'--overlay', '-O', default=argparse.SUPPRESS,
+		help='overlay directory to write (implies --write)',
+		metavar="<OVERLAY>",
+		type=couldbe_fs_dir
+	)
+
+
+	arg (
 		'--show-overlay', '--show',
 		help="print ebuilds and metadata to console",
 		**opt_in
@@ -157,6 +165,12 @@ def get_parser ( CMD_DESC, DEFAULT_CONFIG ):
 		**opt_in
 	)
 
+	arg (
+		'--list-config-entries', '--help-config',
+		help="list all known config entries",
+		**opt_in
+	)
+
 	# --write-desc
 	# --log-level, --log-console, --log...
 
@@ -210,9 +224,14 @@ def parse_argv ( *args, **kw ):
 		write_overlay  = p.write_overlay,
 		print_stats    = p.stats,
 		print_config   = p.print_config,
+		list_config    = p.list_config_entries,
 		force_distroot = p.force_distroot,
 	)
 
+	if given ( 'overlay' ):
+		doconf ( p.overlay, 'OVERLAY.dir' )
+		extra ['write_overlay'] = True
+
 	if given ( 'field_definition' ):
 		doconf ( p.field_definition, 'DESCRIPTION.field_definition_file' )