lib/origen/remote_manager.rb in origen-0.60.7 vs lib/origen/remote_manager.rb in origen-0.60.8

- old
+ new

@@ -55,10 +55,11 @@ if Origen.mode.production? || force remotes.each do |_name, remote| if remote[:path] fail "The following remote is defined as a path, but that is not allowed in production: #{remote}" end + version = Origen::VersionString.new(remote[:version]) unless version.valid? fail "The following remote version is not in a valid format: #{remote}" end if version.latest? @@ -267,11 +268,11 @@ end @remotes end def top_level_remotes - Origen.app.config.remotes #+ Origen.app.config.remotes_dev (there are no core remotes at this time) + Origen.app.config.remotes #+ Origen.app.config.remotes_dev (there are no core remotes at this time) end def remotes @remotes ||= resolve_remotes end @@ -351,10 +352,10 @@ FileUtils.touch "#{dir}/.initial_populate_successful" File.open(version_file, 'w') do |f| f.write tag end end - rescue Origen::GitError, Origen::DesignSyncError, Origen::PerforceError => e + rescue Origen::GitError, Origen::DesignSyncError, Origen::PerforceError => e # If Git failed in the remote, its usually easy to see what the problem is, but now *where* it is. # This will prepend the failing remote along with the error from the revision control system, # then rethrow the error e.message.prepend "When updating remotes for #{remote[:importer].name}: " raise e