autoproj 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 637cb2d979fdfc52bf67351191732a630d2fd5c7
-  data.tar.gz: 0848f873ef7eeee121c45d16f5d7d20d8bc84e37
+  metadata.gz: 3fa89159dba1e3e5b0b0172970d60c23d6164f21
+  data.tar.gz: 0131d4b49f214fbd8df37f7383bdbb743266cac2
 SHA512:
-  metadata.gz: a640bf6335809841f42a268e70fb49e9400c1ff898549b22b73e03c767402b2373240206b7a32075ac83fd667dfaa14039044829b4c486158573f8836403adaa
-  data.tar.gz: 3b219a2cf3ca7baf530452ac46dd1c9bad2fe6d58c8c883cabf05b49bb42bd263c23a6de2f8e85f39c8b3b85e63626404f6a37370bd0c0942011ea5d27916a52
+  metadata.gz: 2724ec5bfb1f6c088a11f04ceca2151d2d1e46df749c706ea2c38903eddcd8bee6e928c1d00abbe88dce1ea77e1acaa12e2891042202f44d6f5a41f3ffd848f4
+  data.tar.gz: 1f86d09aa74d3680e4e632a159dadd31252e8966999b7bea0cdcc29ac997ba92609d848065579ccef15855693c626f1305b007f22619e1da4d214ed356a900de

data/bin/autoproj_bootstrap

@@ -1506,6 +1506,8 @@ fi
             @definitions = definitions.merge(info.definitions) do |h, v1, v2|
                 if v1 != v2
                     root_dir ||= "#{Autoproj.root_dir}/"
+                    old = source_of(h).gsub(root_dir, '')
+                    new = info.source_of(h).gsub(root_dir, '')
 
                     # Warn if the new osdep definition resolves to a different
                     # set of packages than the old one
@@ -1518,8 +1520,6 @@ fi
                         osdep_h
                     end
                     if old_resolved != new_resolved
-                        old = source_of(h).gsub(root_dir, '')
-                        new = info.source_of(h).gsub(root_dir, '')
                         Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overridden by #{new}")
                     end
                 end

data/lib/autoproj/osdeps.rb

@@ -1043,6 +1043,8 @@ fi
             @definitions = definitions.merge(info.definitions) do |h, v1, v2|
                 if v1 != v2
                     root_dir ||= "#{Autoproj.root_dir}/"
+                    old = source_of(h).gsub(root_dir, '')
+                    new = info.source_of(h).gsub(root_dir, '')
 
                     # Warn if the new osdep definition resolves to a different
                     # set of packages than the old one
@@ -1055,8 +1057,6 @@ fi
                         osdep_h
                     end
                     if old_resolved != new_resolved
-                        old = source_of(h).gsub(root_dir, '')
-                        new = info.source_of(h).gsub(root_dir, '')
                         Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overridden by #{new}")
                     end
                 end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.12.3"
+    VERSION = "1.12.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: ruby
 authors:
 - Rock Core Developers