lib/origen/remote_manager.rb in origen-0.22.0 vs lib/origen/remote_manager.rb in origen-0.23.0

@@ -214,13 +214,11 @@
     #     recent one wins.
     def resolve_remotes
       @remotes = {}
       top_level_remotes
       top_level_remotes.each do |remote|
-        traverse_remotes(remote) do |remote|
-          add_remote(remote)
-        end
+        add_remote(remote)
       end
       # Add remotes from imports
       Origen.app.plugins.each do |plugin|
         plugin.config.remotes.each do |import_remote|
           add_remote(import_remote)
@@ -231,32 +229,11 @@
 
     def top_level_remotes
       Origen.app.config.remotes    #+ Origen.app.config.remotes_dev (there are no core remotes at this time)
     end
 
-    # Walks down an import tree recursively yielding all nested imports, if
-    # the imported application has not been populated yet then it will
-    # not return any nested imports.
-    #
-    # This will also update the required origen version if a app
-    # instance is encountered that requires a newer version than the current
-    # version.
-    def traverse_remotes(remote, &block)
-      yield remote
-      if remote_present?(remote)
-        app = Origen.application_instance(origen_root_for(remote), reload: true)
-        app.config.remotes.each do |remote|
-          traverse_remotes(remote, &block)
-        end
-      end
-    end
-
     def remotes
       @remotes ||= resolve_remotes
-    end
-
-    def remote_present?(remote)
-      !!origen_root_for(remote, accept_missing: true)
     end
 
     # Conflicts are resolved by the following rules:
     #   * A path reference always wins.
     #   * If two different paths are found an errors will be raised.