autoproj 1.11.0.rc7 → 1.11.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14b89ab39afd8458a961c2a6377fb0a9612ed54c
-  data.tar.gz: e0e0b962d21398865dbe0b8c286287b0ee7b0cd8
+  metadata.gz: 4a7e2b10a136698035f22e490b2291bedc4c67ad
+  data.tar.gz: e0ad7de5d45818872b30b065bd69fb9e2b83bd1f
 SHA512:
-  metadata.gz: fb711e7b42acf4104ab041753e53318faf1e9cac5b6b7bf5b12431028e4bd959970cb0d6fadba05961ac16c8014c4d5c5a252885deeac4e5582bf73568b810c5
-  data.tar.gz: a0f4c93397ce1bbe70c11ccf8a45339f91fcaa5e1e991f19d13470742324e525763c02fa3cb18a58b63839cebd74408ad0adc73ec05af2a2f53f477a388ace27
+  metadata.gz: f40ab8796d0b7d6b23864e1a201e0424e25e2b5f623b2f55f17e4b4a5129fb5043ca50cca4b81bb455c97a55898b4891e490f0ed8914a5ea54d96cc756c9ecdc
+  data.tar.gz: 752bfe739419d06f3f913ccc5fa68622a57d16d12ab09dd5389859d2ac19bc889885c57502b7547743dc3d48a2b4ff032321e757161c2209a5bc91b009908a62

data/lib/autoproj/ops/configuration.rb

@@ -186,6 +186,13 @@ module Autoproj
             queue
         end
 
+        def repository_id_of(vcs)
+            name = PackageSet.name_of(manifest, vcs)
+            raw_local_dir = PackageSet.raw_local_dir_of(vcs)
+            fake_package = Tools.create_autobuild_package(vcs, name, raw_local_dir)
+            fake_package.importer.repository_id
+        end
+
         # Load the package set information
         #
         # It loads the package set information as required by {manifest} and
@@ -196,14 +203,21 @@ module Autoproj
         #   package sets
         def load_and_update_package_sets(root_pkg_set, only_local = false)
             package_sets = [root_pkg_set]
-            seen_already = Set.new
+            by_repository_id = Hash.new
             by_name = Hash.new
 
             queue = queue_auto_imports_if_needed(Array.new, root_pkg_set)
             while !queue.empty?
                 vcs, options, imported_from = queue.shift
-                next if seen_already.include?(vcs)
-                seen_already << vcs
+                repository_id = repository_id_of(vcs)
+                if already_processed = by_repository_id[repository_id]
+                    already_processed_vcs, already_processed_from = *already_processed
+                    if already_processed_from && (already_processed_vcs != vcs)
+                        Autoproj.warn "already loaded the package set from #{already_processed_vcs} from #{already_processed_from.name}, this overrides different settings (#{vcs}) found in #{imported_from.name}"
+                    end
+                    next
+                end
+                by_repository_id[repository_id] = vcs
 
                 if !vcs.local?
                     update_remote_package_set(vcs, only_local)

data/lib/autoproj/vcs_definition.rb

@@ -144,7 +144,7 @@ module Autoproj
             elsif !other_vcs.local?
                 this_importer = create_autobuild_importer
                 other_importer = other_vcs.create_autobuild_importer
-                this_importer.repository_id == other_importer.repository_id
+                this_importer.source_id == other_importer.source_id
             end
         end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.11.0.rc7"
+    VERSION = "1.11.0.rc8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc7
+  version: 1.11.0.rc8
 platform: ruby
 authors:
 - Rock Core Developers