[Boost-commit] svn:boost r46849 - branches/CMake/release/tools/build/CMake

From: troy_at_[hidden]
Date: 2008-06-29 10:45:57

Author: troy
Date: 2008-06-29 10:45:56 EDT (Sun, 29 Jun 2008)
New Revision: 46849
URL: http://svn.boost.org/trac/boost/changeset/46849

Log:
Error recovery, more logging messages
Text files modified: 
   branches/CMake/release/tools/build/CMake/run_continuous_slave.py.in |    46 +++++++++++++++++++++++++-------------- 
   1 files changed, 29 insertions(+), 17 deletions(-)

Modified: branches/CMake/release/tools/build/CMake/run_continuous_slave.py.in
==============================================================================
--- branches/CMake/release/tools/build/CMake/run_continuous_slave.py.in	(original)
+++ branches/CMake/release/tools/build/CMake/run_continuous_slave.py.in	2008-06-29 10:45:56 EDT (Sun, 29 Jun 2008)
@@ -10,26 +10,38 @@
 wc_path = r'@CMAKE_SOURCE_DIR@'
 
 while True:
-    svn_entry = client.info(wc_path)
+    try:
+        svn_entry = client.info(wc_path)
 
-    print "Wc has url %s rev %d.\nChecking for updates." % (svn_entry.url, svn_entry.revision.number)
+        print "Wc has url %s rev %d.\nChecking for updates." \
+            % (svn_entry.url, svn_entry.revision.number)
 
-    ds = client.diff_summarize(url_or_path1=svn_entry.url,
-                               revision1=pysvn.Revision(pysvn.opt_revision_kind.number, svn_entry.revision.number),
-                               url_or_path2=svn_entry.url,
-                               revision2=pysvn.Revision(pysvn.opt_revision_kind.head)
-                               )
-
-    if len(ds):
-        print "There are %d changesets.  Updating." % len(ds)
-        client.update(wc_path)
-        if os.name == 'nt':
-            os.system('nmake /I clean slave-start test slave-finish')
+        ds = client.diff_summarize(url_or_path1=svn_entry.url,
+                                   revision1=pysvn.Revision(pysvn.opt_revision_kind.number, 
+                                                            svn_entry.revision.number),
+                                   url_or_path2=svn_entry.url,
+                                   revision2=pysvn.Revision(pysvn.opt_revision_kind.head)
+                                   )
+
+        if len(ds):
+            print "There are %d changesets:" % len(ds)
+            for j in ds:
+                print ">>>", j.path
+            print "Updating."
+            client.update(wc_path)
+            if os.name == 'nt':
+                cmd = 'nmake /I clean slave-start test slave-finish'
+            else:
+                cmd = 'make -i clean slave-start test slave-finish'
+            print "Starting build:\n>>> ", cmd
+            os.system(cmd)
         else:
-            os.system('make -i clean slave-start test slave-finish')
-    else:
-        print "No updates."
-        time.sleep(@BOOST_BUILD_SLAVE_SLEEP_DURATION@)
+            print "No updates."
+    except:
+        print "Error.  Will retry"
+    
+    print "Sleeping %d seconds" % @BOOST_BUILD_SLAVE_SLEEP_DURATION@
+    time.sleep(@BOOST_BUILD_SLAVE_SLEEP_DURATION@)