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

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

commit:     668d08e8d76e332e63884b1e10ebc26faa2eb358
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Feb 15 18:58:56 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Feb 15 18:58:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=668d08e8

roverlay/remote/rsync: remote redundant _set_status

RsyncRepo->_dosync(): don't call _set_ready()/_set_fail()

This is done by BasicRepo->sync() anyway.

---
 roverlay/remote/rsync.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/roverlay/remote/rsync.py b/roverlay/remote/rsync.py
index 85cbde7..925dc87 100644
--- a/roverlay/remote/rsync.py
+++ b/roverlay/remote/rsync.py
@@ -8,6 +8,7 @@
 
 __all__ = [ 'RsyncRepo', ]
 
+import os
 import sys
 import subprocess
 
@@ -121,6 +122,7 @@ class RsyncRepo ( BasicRepo ):
       """Syncs this repo. Returns True if sync succeeded, else False.
       All exceptions(?) are catched and interpreted as sync failure.
       """
+      assert os.EX_OK not in RETRY_ON_RETCODE
 
       def waitfor ( p ):
          if p.communicate() != ( None, None ):
@@ -160,11 +162,7 @@ class RsyncRepo ( BasicRepo ):
             proc    = subprocess.Popen ( rsync_cmd, env=RSYNC_ENV )
             retcode = waitfor ( proc )
             proc    = None
-
-         if retcode == 0:
-            self._set_ready ( is_synced=True )
-            return True
-
+         # -- end while
 
       except KeyboardInterrupt:
          # maybe add terminate/kill code here,
@@ -186,11 +184,14 @@ class RsyncRepo ( BasicRepo ):
          # catch exceptions, log them and return False
          self.logger.exception ( e )
 
-      self.logger.error (
-         'Repo {name} cannot be used for ebuild creation due to errors '
-         'while running rsync (return code was {ret}).'.format (
-            name=self.name, ret=retcode
-      ) )
-      self._set_fail()
-      return False
+
+      if retcode == os.EX_OK:
+         return True
+      else:
+         self.logger.error (
+            'Repo {name} cannot be used for ebuild creation due to errors '
+            'while running rsync (return code was {ret}).'.format (
+               name=self.name, ret=retcode
+         ) )
+         return False
    # --- end of _dosync (...) ---