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

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

commit:     bfef26d7cf86185b1d15764e682a221431cce584
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Sep 10 14:27:51 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Sep 10 14:27:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=bfef26d7

misc argparser changes

---
 roverlay/argparser.py | 25 ++++++++++++++++---------
 roverlay/argutil.py   |  6 ++++++
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/roverlay/argparser.py b/roverlay/argparser.py
index c7be8f6..a08cf00 100644
--- a/roverlay/argparser.py
+++ b/roverlay/argparser.py
@@ -18,7 +18,8 @@ from roverlay.argutil import \
    get_gid, is_gid, get_uid, is_uid, \
    is_fs_dir, is_fs_dir_or_void, is_fs_file, \
    is_fs_file_or_dir, is_fs_file_or_void, \
-   is_config_opt, dirstr, dirstr_existing, couldbe_dirstr_existing, \
+   is_config_opt, dirstr, dirstr_existing, \
+   couldbe_dirstr_existing, couldbe_dirstr_existing_or_empty, \
    ArgumentParserProxy
 
 
@@ -497,14 +498,11 @@ class RoverlayArgumentParserBase ( roverlay.argutil.ArgumentParserProxy ):
       return self.setup_misc_minimal()
    # --- end of setup_misc (...) ---
 
-   def setup_setup_minimal ( self ):
-      assert os.sep == "/"
-
-      arg = self.add_argument_group ( 'setup', title='setup options' )
+   def setup_setup_minimal ( self, title='setup options' ):
+      arg = self.add_argument_group ( 'setup', title=title )
 
       arg (
          '--work-root', '-W', dest='work_root',
-         default="~/roverlay",
          flags=self.ARG_WITH_DEFAULT|self.ARG_META_DIR,
          type=couldbe_dirstr_existing,
          help=(
@@ -514,24 +512,33 @@ class RoverlayArgumentParserBase ( roverlay.argutil.ArgumentParserProxy ):
 
       arg (
          '--data-root', '-D', dest='data_root',
-         default="/usr/share/roverlay",
          flags=self.ARG_WITH_DEFAULT|self.ARG_META_DIR,
          type=couldbe_dirstr_existing,
          help='roverlay\'s static data (eclass, hook scripts,...)',
       )
 
       arg (
-         '--conf-root', '-C', dest='conf_root',
-         default="/etc/roverlay",
+         '--conf-root', dest='conf_root',
          flags=self.ARG_WITH_DEFAULT|self.ARG_META_DIR,
          type=couldbe_dirstr_existing,
          help='roverlay\'s config files (dependency rules,...)',
       )
 
+      arg (
+         '--conf-dir', '--my-conf-root', '-C', dest='private_conf_root',
+         flags=self.ARG_WITH_DEFAULT|self.ARG_META_DIR,
+         type=couldbe_dirstr_existing_or_empty,
+         help='private directory for config files (\'\' for --conf-root)',
+      )
 
       return arg
    # --- end of setup_setup_minimal (...) ---
 
+   def parse_setup_minimal ( self ):
+      if not self.parsed.get ( 'private_conf_root', True ):
+         self.parsed ['private_conf_root'] = self.parsed ['conf_root']
+   # --- end of parse_setup_minimal (...) ---
+
 # --- end of RoverlayArgumentParserBase ---
 
 

diff --git a/roverlay/argutil.py b/roverlay/argutil.py
index d6ba97e..198ccda 100644
--- a/roverlay/argutil.py
+++ b/roverlay/argutil.py
@@ -146,6 +146,12 @@ def couldbe_dirstr_existing ( value ):
          "{!r} cannot be a directory.".format ( dstr )
       )
 
+def couldbe_dirstr_existing_or_empty ( value ):
+   if not value:
+      return ""
+   else:
+      return couldbe_dirstr_existing ( value )
+
 class ArgumentParserError ( Exception ):
    pass