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

[André Erdmann]

commit:     0c9efb4ddce50c2c9e94100eb77812238650d7eb
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 10 17:43:08 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 10 17:43:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=0c9efb4d

try to run without a config file

---
 roverlay/__init__.py |    3 ++-
 roverlay/argutil.py  |    8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/roverlay/__init__.py b/roverlay/__init__.py
index 1399df0..3d1ecfa 100644
--- a/roverlay/__init__.py
+++ b/roverlay/__init__.py
@@ -27,7 +27,8 @@ def load_config_file ( cfile, extraconf=None ):
 	* extraconf -- a dict with additional config entries that will override
 	               entries read from cfile
 	"""
-	roverlay.config.loader().load_config ( cfile )
+	if cfile:
+		roverlay.config.loader().load_config ( cfile )
 
 	if extraconf is not None:
 		roverlay.config.access().merge_with ( extraconf )

diff --git a/roverlay/argutil.py b/roverlay/argutil.py
index 6249644..98a0406 100644
--- a/roverlay/argutil.py
+++ b/roverlay/argutil.py
@@ -29,6 +29,12 @@ def get_parser ( CMD_DESC, DEFAULT_CONFIG ):
 			)
 		return d
 
+	def is_fs_file_or_void ( value ):
+		if value:
+			return is_fs_file ( value )
+		else:
+			return ''
+
 	parser = argparse.ArgumentParser (
 		description='\n'.join ((
 			roverlay.description_str, roverlay.license_str,
@@ -67,7 +73,7 @@ def get_parser ( CMD_DESC, DEFAULT_CONFIG ):
 		'-c', '--config',
 		default=DEFAULT_CONFIG,
 		help="config file",
-		**fs_file
+		type=is_fs_file_or_void, metavar="<file>"
 	)
 	arg (
 		'-F', '--field-definition', '--fdef', default=argparse.SUPPRESS,