Cleanup.

svn path=/branches/tk705/; revision=6235

1 files changed, 2 insertions, 6 deletions

diff --git a/rp/rcynic/rcynicng b/rp/rcynic/rcynicng
index 12adcd34..17d06992 100755
--- a/rp/rcynic/rcynicng
+++ b/rp/rcynic/rcynicng
@@ -1075,7 +1075,8 @@ class Fetcher(object):
                           for serial in xrange(snapshot.serial + 1, serial + 1)]
                 futures = []
 
-                def start_fetches():
+                while deltas or futures:
+
                     while deltas and len(futures) < args.fetch_ahead_goal:
                         serial, url, hash = deltas.pop(0)
                         logger.debug("RRDP %s serial %s fetching %s", self.uri, serial, url)
@@ -1086,13 +1087,8 @@ class Fetcher(object):
                             session_id = session_id,
                             serial     = serial))
 
-                start_fetches()
-
-                while futures:
                     retrieval, delta = yield futures.pop(0)
 
-                    start_fetches()
-
                     serial = long(delta.get("serial"))
                     assert serial == snapshot.serial + 1