bin/autoproj_bootstrap in autoproj-1.12.2 vs bin/autoproj_bootstrap in autoproj-1.12.3

@@ -1504,23 +1504,23 @@
         def merge(info)
             root_dir = nil
             @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
                 v2
             end