autoproj 1.11.0.rc14 → 1.11.0.rc15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a8629a323574b1bf836ed80b52cc78cac7302e0
-  data.tar.gz: 52d2f50f98ed56320f97c9c9158fa7f6e78376e8
+  metadata.gz: f532e864fc2e5926742f48b077550a790c3baacf
+  data.tar.gz: 63a70a19b2f5aa23508031293ed199439a1c2dde
 SHA512:
-  metadata.gz: 2013f14a6b5c1a6628526807dc0fb976b3d02c3f53ae0510ecda9d40a66e968f1908fd22d24b85255e7c1ff1ffd70ed8eb6b904c57bb4be20a8399f94137c4e2
-  data.tar.gz: 00004fd89a6995b9df8781ca1b1ef949bcdf98a2fcf3586f7022fdb7ef90a5d274c06c695f3e40970df13a0fb63b6976748154a9a9bf8a8cb631706c415b8d3a
+  metadata.gz: 7a47dd280accc2939eea99009665d4ad575366e7e8b673a1072c661bfe2088433e19e2b58a83b7d9df875e1471d2dd8761356b58cc5cf57b211a552a8726e71c
+  data.tar.gz: f28e24343f5ed84060f2c769ad48c36ceeef17334336645c8c8a0bb116d6ac600f252fd1f8d79deef6bee21891fad8cdd227d69be70ac60776d7bf26b169268f

data/lib/autoproj/ops/configuration.rb

@@ -212,7 +212,7 @@ module Autoproj
                 repository_id = repository_id_of(vcs)
                 if already_processed = by_repository_id[repository_id]
                     already_processed_vcs, already_processed_from, pkg_set = *already_processed
-                    if already_processed_from && (already_processed_vcs != vcs)
+                    if (already_processed_from != root_pkg_set) && (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
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.11.0.rc14"
+    VERSION = "1.11.0.rc15"
 end

metadata

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