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

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

commit:     6e32f77915e8bf388059f79750a5a30bf8d2fb49
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul 15 22:29:05 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul 15 22:29:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=6e32f779

--run-script: respect EvENT_HOOK_RESTRICT

---
 roverlay/hook.py |  4 ++--
 roverlay/main.py | 25 +++++++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/roverlay/hook.py b/roverlay/hook.py
index e56aa33..262d3c2 100644
--- a/roverlay/hook.py
+++ b/roverlay/hook.py
@@ -32,12 +32,12 @@ _EVENT_POLICY = 0
 class HookException ( Exception ):
    pass
 
-def setup():
+def setup ( force=False ):
    global _EVENT_SCRIPT
    global _EVENT_POLICY
    global _EVENT_RESTRICT
 
-   if roverlay.config.get ( 'write_disabled', False ):
+   if roverlay.config.get ( 'write_disabled', False ) and not force:
       _EVENT_SCRIPT = False
       return
 

diff --git a/roverlay/main.py b/roverlay/main.py
index 24c02c6..7a88171 100644
--- a/roverlay/main.py
+++ b/roverlay/main.py
@@ -497,16 +497,21 @@ def main (
 
    if do_runscript:
       import roverlay.tools.shenv
-      sys.exit (
-         roverlay.tools.shenv.run_script (
-            script         = extra_opts ['run_script'],
-            phase          = "user",
-            argv           = extra_opts ['run_script_args'],
-            return_success = False,
-            log_output     = False,
-            initial_dir    = os.getcwd(),
-         ).returncode
-      )
+      import roverlay.hook
+      roverlay.hook.setup ( force=True )
+      if roverlay.hook.phase_allowed ( "user" ):
+         sys.exit (
+            roverlay.tools.shenv.run_script (
+               script         = extra_opts ['run_script'],
+               phase          = "user",
+               argv           = extra_opts ['run_script_args'],
+               return_success = False,
+               log_output     = False,
+               initial_dir    = os.getcwd(),
+            ).returncode
+         )
+      else:
+         die ( "--run-script: 'user' phase is not allowed." )
    elif do_setupdirs:
       sys.exit ( run_setupdirs (
          conf, extra_opts['target_uid'], extra_opts['target_gid']