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

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

commit:     1feee9c63998b09147f9de18c4e39c5f97f8e067
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Aug  7 15:40:56 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Aug  7 15:40:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=1feee9c6

roverlay: --strict[-sync]

--strict-sync: exit (call die()) if sync doesn't succeed
--strict: enable all --strict- switches

---
 roverlay/argutil.py | 16 ++++++++++++++++
 roverlay/main.py    |  8 +++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/roverlay/argutil.py b/roverlay/argutil.py
index 0f0b593..13f23df 100644
--- a/roverlay/argutil.py
+++ b/roverlay/argutil.py
@@ -331,6 +331,20 @@ def get_parser ( command_map, default_config_file, default_command='create' ):
    )
 
    arg (
+      '--strict',
+      help='enable all --strict-<sth> options',
+      default=False,
+      action='store_true',
+   )
+
+   arg (
+      '--strict-sync',
+      help='exit on any sync errors',
+      default=False,
+      action='store_true',
+   )
+
+   arg (
       '--nosync', '--no-sync', default=argparse.SUPPRESS,
       help="disable syncing with remotes (offline mode).",
       action='store_true',
@@ -510,6 +524,8 @@ def parse_argv ( command_map, **kw ):
       target_gid              = p.target_gid,
       dump_stats              = p.dump_stats,
       sync_imported           = p.sync_imported,
+      strict                  = p.strict,
+      strict_sync             = p.strict_sync,
    )
 
 

diff --git a/roverlay/main.py b/roverlay/main.py
index 4954645..4a65aee 100644
--- a/roverlay/main.py
+++ b/roverlay/main.py
@@ -120,6 +120,9 @@ def main (
 
    def run_sync():
       if "sync" in actions_done: return
+
+      STRICT_SYNC = OPTION ( 'strict' ) or OPTION ( 'strict_sync' )
+
       try:
          # set up the repo list
          global repo_list
@@ -136,7 +139,7 @@ def main (
             repo_list.load()
 
          ## this runs _nosync() or _sync(), depending on extra_opts->nosync
-         repo_list.sync()
+         sync_success = repo_list.sync ( fail_greedy=STRICT_SYNC )
          set_action_done ( "sync" )
 
       except KeyboardInterrupt:
@@ -149,6 +152,9 @@ def main (
             )
          else:
             raise
+      else:
+         if not sync_success and STRICT_SYNC:
+            die ( "errors occured while syncing.", DIE.SYNC )
    # --- end of run_sync() ---
 
    def run_apply_package_rules():