autoproj 1.11.0.rc4 → 1.11.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71c03141d5e512a7cc7560bd21dff1ba60167a5b
-  data.tar.gz: dd906e80f5772a81b6111026f6fbc152418e6b5e
+  metadata.gz: 1416fc8be90452353f3a55a7db1d98b6fac7b063
+  data.tar.gz: bddd592807757b46c4e020597418d8153703801f
 SHA512:
-  metadata.gz: bc3ab52a3ce026473f3f3c3fed621ca555321294e89d824841ee4318ffe03e41865fa9dc6c92889f4cd0010ba07ef64ebb7159bfed6876ca31bc0a20dc8290cd
-  data.tar.gz: 5a998cd2a7c5d58df75b7ac94a1ee3961d068104c2ea19c65e52175a29fdd9d304ec49511ecd9318c521200d7c058e428d11069d87c3fd361389d3c45b427f31
+  metadata.gz: 2b5aca4e7ba60e615309ecabe3d75eb868258f53919514c6a5af90214362210e997c29e55f4b37eef1141b6011f56b269bcc77c4d93e16ca26c0a20ca4194cba
+  data.tar.gz: c785620bc8873d98dc327175c42d900047af9072f32481e6bd96220719b217d86f2c92936ce0bc3914d41bd752b87e3fc14ba480abc19d8f99b58b2432f579ca

data/bin/autoproj-cache

@@ -13,6 +13,6 @@ Autoproj::CmdLine.report do
     cache_dir = File.expand_path(cache_dir, root_dir)
 
     cache_op = Autoproj::Ops::Cache.new(cache_dir, Autoproj.manifest)
-    cache_op.create_or_update
+    cache_op.create_or_update(Autobuild.ignore_errors)
 end
 

data/lib/autoproj/ops/cache.rb

@@ -56,7 +56,7 @@ module Autoproj
                 end
             end
 
-            def create_or_update
+            def create_or_update(keep_going = false)
                 FileUtils.mkdir_p cache_dir
 
                 packages = manifest.each_autobuild_package.
@@ -64,15 +64,37 @@ module Autoproj
                 total = packages.size
                 Autoproj.message "Handling #{total} packages"
                 packages.each_with_index do |pkg, i|
-                    case pkg.importer
-                    when Autobuild::Git
-                        Autoproj.message "  [#{i}/#{total}] caching #{pkg.name} (git)"
-                        cache_git(pkg)
-                    when Autobuild::ArchiveImporter
-                        Autoproj.message "  [#{i}/#{total}] caching #{pkg.name} (archive)"
-                        cache_archive(pkg)
-                    else
-                        Autoproj.message "  [#{i}/#{total}] not caching #{pkg.name} (cannot cache #{pkg.importer.class})"
+                    begin
+                        case pkg.importer
+                        when Autobuild::Git
+                            Autoproj.message "  [#{i}/#{total}] caching #{pkg.name} (git)"
+                            cache_git(pkg)
+                        when Autobuild::ArchiveImporter
+                            Autoproj.message "  [#{i}/#{total}] caching #{pkg.name} (archive)"
+                            cache_archive(pkg)
+                        else
+                            Autoproj.message "  [#{i}/#{total}] not caching #{pkg.name} (cannot cache #{pkg.importer.class})"
+                        end
+                    rescue Interrupt
+                        raise
+                    rescue ::Exception => e
+                        if keep_going
+                            pkg.error "       failed to cache #{pkg.name}, but going on as requested"
+                            lines = e.to_s.split("\n")
+                            if lines.empty?
+                                lines = e.message.split("\n")
+                            end
+                            if lines.empty?
+                                lines = ["unknown error"]
+                            end
+                            pkg.message(lines.shift, :red, :bold)
+                            lines.each do |line|
+                                pkg.message(line)
+                            end
+                            nil
+                        else
+                            raise
+                        end
                     end
                 end
             end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.11.0.rc4"
+    VERSION = "1.11.0.rc5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc4
+  version: 1.11.0.rc5
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild