autoproj 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b754a2357a38c88b0f4e726147af37cef1269129
-  data.tar.gz: 67200ea837343e244a63bbd6b31c06a14e21b392
+  metadata.gz: 340c2f6446333417f7b1a32b7a6726778c9a5b62
+  data.tar.gz: 9dad43165084ce864f68a82e7824ece5e5f6c665
 SHA512:
-  metadata.gz: 49ca2c27d09c9fe872752b31d4b8e6b2b638de71b62d67d37315e35ab7633b137ab8718c6638440c2d77f92cd80172173d5153399773dbadb274f46b9826e408
-  data.tar.gz: 189fcedc88fa143d52a4b4e4fffc1509a136a2177b9b79f1e9c7f429a708f908195ab06fbd8812df2c97d95ff065205f97526d4f145ab54c245bb2c9d9dfa472
+  metadata.gz: eddbd53a7a1b4bb49f17af6b863559f987a5cbee3fd94e96890c0146f817124d5d5d7d88e047a8db45e0ea4fe7a7922cbabfbc8f1ce93120691fb0f67adca0c0
+  data.tar.gz: f6a605e57e30a4195ebdd62254780473261370a8c700e5160c4bfd654725832b36530c41e27957ae5bc958b38fc7d24d2efef6be02fd2cf21f7db1ca9f08ee26

data/lib/autoproj/ops/import.rb

@@ -114,9 +114,7 @@ def post_package_import(selection, manifest, pkg, reverse_dependencies, auto_exc
                     false
                 else
                     if pkg.checked_out?
-                        Autoproj.each_post_import_block(pkg) do |block|
-                            block.call(pkg)
-                        end
+                        process_post_import_blocks(pkg)
                     end
                     import_next_step(pkg, reverse_dependencies)
                 end
@@ -334,7 +332,7 @@ def import_selected_packages(selection,
                 end
             end
             
-            def finalize_package_load(processed_packages)
+            def finalize_package_load(processed_packages, auto_exclude: auto_exclude?)
                 manifest = ws.manifest
 
                 all = Set.new
@@ -349,10 +347,14 @@ def finalize_package_load(processed_packages)
 
                     pkg_definition = manifest.find_package_definition(pkg_name)
                     pkg = pkg_definition.autobuild
-                    if !processed_packages.include?(pkg_definition) && File.directory?(pkg.srcdir)
-                        manifest.load_package_manifest(pkg.name)
-                        Autoproj.each_post_import_block(pkg) do |block|
-                            block.call(pkg)
+                    if !processed_packages.include?(pkg_definition) && pkg.checked_out?
+                        begin
+                            manifest.load_package_manifest(pkg.name)
+                            process_post_import_blocks(pkg)
+                        rescue Exception => e
+                            raise if !auto_exclude
+                            manifest.exclude_package(pkg.name, "#{pkg.name} had an error when being loaded (#{e.message}) and auto_exclude is true")
+                            next
                         end
                     end
 
@@ -403,7 +405,7 @@ def import_packages(selection,
                     raise failures.first
                 end
 
-                finalize_package_load(all_processed_packages)
+                finalize_package_load(all_processed_packages, auto_exclude: auto_exclude)
 
                 all_enabled_osdeps = selection.each_osdep_package_name.to_set
                 all_enabled_sources = all_processed_packages.map(&:name)
@@ -442,6 +444,12 @@ def import_packages(selection,
                 end
             end
 
+            def process_post_import_blocks(pkg)
+                Autoproj.each_post_import_block(pkg) do |block|
+                    block.call(pkg)
+                end
+            end
+
             def update_log_for_processed_packages(all_processed_packages, exception)
                 all_updated_packages = all_processed_packages.find_all do |processed_pkg|
                     processed_pkg.autobuild.updated?

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.2.1"
+    VERSION = "2.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Sylvain Joyeux
@@ -365,3 +365,4 @@ signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []
+has_rdoc: