← Back to branch summary

~ubuntu-branches/ubuntu/wily/ruby-net-ssh/wily

« back to all changes in this revision

Viewing changes to lib/net/ssh/config.rb

  • Committer: Package Import Robot
  • Author(s): David Suárez
  • Date: 2013-07-30 17:45:29 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20130730174529-pvhpqzrna5hg0u7y
Tags: 1:2.6.8-1
http://bugs.debian.org/718118
* Team upload.
* New upstream release
* Revert drop of fix-test-inheritance.patch: Tests are still failing
  (closes: #718118)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/net/ssh/config.rb
92
92
            multi_host = value.to_s.split(/\s+/)
93
93
            matched_host = multi_host.select { |h| host =~ pattern2regex(h) }.first
94
94
            seen_host = true
 
95
            settings[key] = host
95
96
          elsif !seen_host
96
97
            if key == 'identityfile'
97
98
              (globals[key] ||= []) << value
145
146
          when 'hostkeyalias' then
146
147
            hash[:host_key_alias] = value
147
148
          when 'hostname' then
148
 
            hash[:host_name] = value
 
149
            hash[:host_name] = value.gsub(/%h/, settings['host'])
149
150
          when 'identityfile' then
150
151
            hash[:keys] = value
151
152
          when 'macs' then