autoproj 1.11.0.rc14 → 1.11.0.rc15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/autoproj/ops/configuration.rb +1 -1
- data/lib/autoproj/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f532e864fc2e5926742f48b077550a790c3baacf
|
|
4
|
+
data.tar.gz: 63a70a19b2f5aa23508031293ed199439a1c2dde
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7a47dd280accc2939eea99009665d4ad575366e7e8b673a1072c661bfe2088433e19e2b58a83b7d9df875e1471d2dd8761356b58cc5cf57b211a552a8726e71c
|
|
7
|
+
data.tar.gz: f28e24343f5ed84060f2c769ad48c36ceeef17334336645c8c8a0bb116d6ac600f252fd1f8d79deef6bee21891fad8cdd227d69be70ac60776d7bf26b169268f
|
|
@@ -212,7 +212,7 @@ module Autoproj
|
|
|
212
212
|
repository_id = repository_id_of(vcs)
|
|
213
213
|
if already_processed = by_repository_id[repository_id]
|
|
214
214
|
already_processed_vcs, already_processed_from, pkg_set = *already_processed
|
|
215
|
-
if already_processed_from && (already_processed_vcs != vcs)
|
|
215
|
+
if (already_processed_from != root_pkg_set) && (already_processed_vcs != vcs)
|
|
216
216
|
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}"
|
|
217
217
|
end
|
|
218
218
|
|
data/lib/autoproj/version.rb
CHANGED