autoproj 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8175c51311f09040e84654e66de8fcaa1389a289
-  data.tar.gz: f5e0cb0c5d683be7c7d7daa15cf46afe46a58fbd
+  metadata.gz: 637cb2d979fdfc52bf67351191732a630d2fd5c7
+  data.tar.gz: 0848f873ef7eeee121c45d16f5d7d20d8bc84e37
 SHA512:
-  metadata.gz: fba4def407135c8a4ffca75bd5cf2641e51dab54f219aa34eee7e18f2505147b1cabcd2c87f8765f34e18b1f753c288fddd72872d6f0a6633b336f567b7d8d0c
-  data.tar.gz: 8b724473e08ca5e0c21a1b97a3082da2c5193b7e9b89d8dfebaaaa71b4382560662f4de0c89864b3405882b79f56f4b30857d5e15bb9b663f0aad28c641629d2
+  metadata.gz: a640bf6335809841f42a268e70fb49e9400c1ff898549b22b73e03c767402b2373240206b7a32075ac83fd667dfaa14039044829b4c486158573f8836403adaa
+  data.tar.gz: 3b219a2cf3ca7baf530452ac46dd1c9bad2fe6d58c8c883cabf05b49bb42bd263c23a6de2f8e85f39c8b3b85e63626404f6a37370bd0c0942011ea5d27916a52

data/bin/autoproj_bootstrap

@@ -1506,20 +1506,20 @@ 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
                     old_resolved = resolve_package(h).inject(Hash.new) do |osdep_h, (handler, status, list)|
                         osdep_h[handler.name] = [status, list]
-                        h
+                        osdep_h
                     end
                     new_resolved = info.resolve_package(h).inject(Hash.new) do |osdep_h, (handler, status, list)|
                         osdep_h[handler.name] = [status, list]
-                        h
+                        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,20 +1043,20 @@ 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
                     old_resolved = resolve_package(h).inject(Hash.new) do |osdep_h, (handler, status, list)|
                         osdep_h[handler.name] = [status, list]
-                        h
+                        osdep_h
                     end
                     new_resolved = info.resolve_package(h).inject(Hash.new) do |osdep_h, (handler, status, list)|
                         osdep_h[handler.name] = [status, list]
-                        h
+                        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.2"
+    VERSION = "1.12.3"
 end

data/test/test_os_dependencies.rb

@@ -548,5 +548,39 @@ class TC_OSDependencies < Test::Unit::TestCase
         flexmock(ENV).should_receive('[]').with('PATH').and_return('')
         assert !Autoproj::OSDependencies.os_from_lsb
     end
+
+    def test_merge_issues_a_warning_if_two_definitions_differ_by_the_operating_system_packages
+        Autoproj::OSDependencies.operating_system = [['os0'], []]
+        osdeps0 = Autoproj::OSDependencies.new
+        osdeps0.definitions['pkg'] = Hash['os0' => ['osdep0'], 'gem' => ['gem0']]
+        osdeps0.sources['pkg'] = 'bla/bla'
+        osdeps1 = Autoproj::OSDependencies.new
+        osdeps1.definitions['pkg'] = Hash['os0' => ['osdep1'], 'gem' => ['gem0']]
+        osdeps1.sources['pkg'] = 'bla/bla'
+        flexmock(Autoproj).should_receive(:warn).once
+        osdeps0.merge(osdeps1)
+    end
+    def test_merge_issues_a_warning_if_two_definitions_differ_by_an_os_independent_package
+        Autoproj::OSDependencies.operating_system = [['os0'], []]
+        osdeps0 = Autoproj::OSDependencies.new
+        osdeps0.definitions['pkg'] = Hash['os0' => ['osdep0'], 'gem' => ['gem0']]
+        osdeps0.sources['pkg'] = 'bla/bla'
+        osdeps1 = Autoproj::OSDependencies.new
+        osdeps1.definitions['pkg'] = Hash['os0' => ['osdep0'], 'gem' => ['gem1']]
+        osdeps1.sources['pkg'] = 'bla/bla'
+        flexmock(Autoproj).should_receive(:warn).once
+        osdeps0.merge(osdeps1)
+    end
+    def test_merge_does_not_issue_a_warning_if_two_definitions_are_identical_for_the_local_operating_system
+        Autoproj::OSDependencies.operating_system = [['os0'], []]
+        osdeps0 = Autoproj::OSDependencies.new
+        osdeps0.definitions['pkg'] = Hash['os0' => ['osdep0'], 'gem' => ['gem0'], 'os1' => ['osdep0']]
+        osdeps0.sources['pkg'] = 'bla/bla'
+        osdeps1 = Autoproj::OSDependencies.new
+        osdeps1.definitions['pkg'] = Hash['os0' => ['osdep0'], 'gem' => ['gem0'], 'os1' => ['osdep1']]
+        osdeps1.sources['pkg'] = 'bla/bla'
+        flexmock(Autoproj).should_receive(:warn).never
+        osdeps0.merge(osdeps1)
+    end
 end
 

metadata

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