autoproj 1.9.7.rc1 → 1.9.7.rc2

data/bin/autoproj-cache

@@ -4,6 +4,20 @@ require 'autoproj'
 
 root_dir = Autoproj::CmdLine.initialize_root_directory
 
+def with_retry(count)
+    (count + 1).times do |i|
+        begin
+            break yield
+        rescue Autobuild::SubcommandFailed
+            if i == count
+                raise
+            else
+                Autobuild.message "  failed, retrying (#{i}/#{count})"
+            end
+        end
+    end
+end
+
 Autoproj::CmdLine.report do
     cache_dir, *_ =
         Autoproj.silent do
@@ -43,11 +57,16 @@ Autoproj::CmdLine.report do
             remote_name = pkg.name.gsub(/[^\w]/, '_')
             pkg.importer.remote_name = remote_name
             pkg.importer.update_remotes_configuration(pkg, 'autoproj-cache')
-            Autobuild::Subprocess.run('autoproj-cache', :import, Autobuild.tool('git'), '--git-dir', git_cache_dir, 'remote', 'update', remote_name)
+
+            with_retry(10) do
+                Autobuild::Subprocess.run('autoproj-cache', :import, Autobuild.tool('git'), '--git-dir', git_cache_dir, 'remote', 'update', remote_name)
+            end
         elsif pkg.importer.kind_of?(Autobuild::ArchiveImporter)
             Autoproj.message "  caching #{pkg.name} (archive)"
             pkg.importer.cachedir = archive_cache_dir
-            pkg.importer.update_cache(pkg)
+            with_retry(10) do
+                pkg.importer.update_cache(pkg)
+            end
         end
     end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc1"
+    VERSION = "1.9.7.rc2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.7.rc1
+  version: 1.9.7.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild