[gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/config/, roverlay/

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

commit:     63c1d92092acfb064e6306d51fb6d5cd99c3afac
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jun 20 22:16:29 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jun 20 22:16:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=63c1d920

roverlay, config: nosync/hooks, fixup

---
 roverlay/argutil.py         | 13 ++++++++++---
 roverlay/config/const.py    |  6 +++++-
 roverlay/config/entrymap.py | 16 +++++++++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/roverlay/argutil.py b/roverlay/argutil.py
index 99842fd..fe541ac 100644
--- a/roverlay/argutil.py
+++ b/roverlay/argutil.py
@@ -277,9 +277,9 @@ def get_parser ( command_map, default_config_file, default_command='create' ):
    )
 
    arg (
-      '--nosync', '--no-sync',
+      '--nosync', '--no-sync', default=argparse.SUPPRESS,
       help="disable syncing with remotes (offline mode).",
-      **opt_in
+      action='store_true',
    )
 
    arg (
@@ -398,7 +398,8 @@ def parse_argv ( command_map, **kw ):
    commands = ( p.commands, ) if isinstance ( p.commands, str ) else p.commands
    conf  = dict()
    extra = dict (
-      nosync                  = p.nosync,
+# TODO: remove nosync entirely from extra
+#      nosync                  = p.nosync,
 #      debug                   = p.debug,
       show_overlay            = p.show_overlay,
       write_overlay           = p.write_overlay,
@@ -445,6 +446,11 @@ def parse_argv ( command_map, **kw ):
       extra ['nosync']   = True
       if 'create' in command_map:
          commands.append ( "create" )
+   elif given ( 'nosync' ):
+      extra ['nosync'] = True
+
+   if extra.get ( 'nosync', False ):
+      doconf ( True, 'nosync' )
 
    if given ( 'deprule_file' ):
       doconf ( p.deprule_file, 'DEPRES.SIMPLE_RULES.files' )
@@ -452,5 +458,6 @@ def parse_argv ( command_map, **kw ):
    if given ( 'manifest_implementation' ):
       doconf ( p.manifest_implementation, 'OVERLAY.manifest_implementation' )
 
+
    return ( commands, p.config, conf, extra )
 # --- end of parse_argv (...) ---

diff --git a/roverlay/config/const.py b/roverlay/config/const.py
index 3d330ba..4ee9d45 100644
--- a/roverlay/config/const.py
+++ b/roverlay/config/const.py
@@ -12,7 +12,11 @@ import time
 __all__ = [ 'clone', 'lookup' ]
 
 _CONSTANTS = dict (
-   DEBUG = False,
+   # FIXME: capslock? ;)
+   DEBUG  = False,
+   debug  = False,
+
+   nosync = False,
 
    # logging defaults are in recipe/easylogger
 

diff --git a/roverlay/config/entrymap.py b/roverlay/config/entrymap.py
index 65f2df5..5ae7b78 100644
--- a/roverlay/config/entrymap.py
+++ b/roverlay/config/entrymap.py
@@ -230,6 +230,7 @@ CONFIG_ENTRY_MAP = dict (
    ),
 
    overlay_additions_dir = dict (
+      path        = [ 'OVERLAY', 'additions_dir', ],
       value_type  = 'fs_abs:fs_dir',
       description = 'directory containing ebuilds and ebuild patches',
    ),
@@ -260,7 +261,7 @@ CONFIG_ENTRY_MAP = dict (
    ),
    # ebuild is used to create Manifest files
    ebuild_prog = dict (
-      path        = [ 'TOOLS', 'ebuild_exe' ],
+      path        = [ 'TOOLS', 'EBUILD', 'exe' ],
       value_type  = 'fs_path',
       description = "name of/path to the ebuild executable",
    ),
@@ -434,6 +435,14 @@ CONFIG_ENTRY_MAP = dict (
 
    # --- package rules
 
+   # == hooks / scripts ==
+
+   hook_overlay_success = dict (
+      path        = [ 'HOOK', 'OVERLAY', 'success', ],
+      value_type  = 'fs_file',
+      description = "script that is run just before exiting normally",
+   ),
+
    # == other ==
 
    cachedir = dict (
@@ -448,6 +457,11 @@ CONFIG_ENTRY_MAP = dict (
       description = 'directory for temporary data',
    ),
 
+   nosync = dict (
+      value_type  = yesno,
+      description = 'forbid/allow syncing with remotes',
+   )
+
    # --- other
 
 )