← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ruby1.9/trusty

« back to all changes in this revision

Viewing changes to ext/Win32API/lib/win32/resolv.rb

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2006-05-08 22:23:12 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060508222312-w2wqeaz030ifi59j
Tags: 1.9.0+20060423-3ubuntu1
* Resynchronized with Debian.
* Only change from Debian is the addition of
  debian/patches/903_sparc_fix_define.patch to fix illegal instructions
  at runtime on sparc. (change from 1.9.0+20050921-1ubuntu1)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/Win32API/lib/win32/resolv.rb
84
84
                  [ 'NameServer', 'DhcpNameServer' ].each do |key|
85
85
                    ns = regif.read_s(key)
86
86
                    unless ns.empty?
87
 
                      nameserver.concat(ns.split(/\s+/))
 
87
                      nameserver.concat(ns.split(/[,\s]\s*/))
88
88
                      break
89
89
                    end
90
90
                  end
141
141
              slist = reg.read_s("SearchList")
142
142
              search << domain unless domain.empty?
143
143
              search.concat(slist.split(/,\s*/))
144
 
              nameserver.concat(ns.split(/,\s*/))
 
144
              nameserver.concat(ns.split(/[,\s]\s*/))
145
145
            end
146
146
          end
147
147
        rescue Registry::Error