Hello community, here is the log from the commit of package yast2-slp for openSUSE:Factory checked in at 2014-03-21 12:13:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-slp (Old) and /work/SRC/openSUSE:Factory/.yast2-slp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-slp" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-slp/yast2-slp.changes 2014-02-22 20:44:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-slp.new/yast2-slp.changes 2014-03-21 12:13:51.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 10 14:13:13 UTC 2014 - vmoravec@suse.com + +- Fix dns resolution exception (bnc#867357) +- 3.1.5 + +------------------------------------------------------------------- Old: ---- yast2-slp-3.1.4.tar.bz2 New: ---- yast2-slp-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp.spec ++++++ --- /var/tmp/diff_new_pack.Nq77tb/_old 2014-03-21 12:13:52.000000000 +0100 +++ /var/tmp/diff_new_pack.Nq77tb/_new 2014-03-21 12:13:52.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-slp-3.1.4.tar.bz2 -> yast2-slp-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.4/package/yast2-slp.changes new/yast2-slp-3.1.5/package/yast2-slp.changes --- old/yast2-slp-3.1.4/package/yast2-slp.changes 2014-02-21 15:27:51.000000000 +0100 +++ new/yast2-slp-3.1.5/package/yast2-slp.changes 2014-03-11 10:24:19.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 10 14:13:13 UTC 2014 - vmoravec@suse.com + +- Fix dns resolution exception (bnc#867357) +- 3.1.5 + +------------------------------------------------------------------- Fri Feb 21 15:23:00 CET 2014 - mls@suse.de - Adapt to openslp-2.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.4/package/yast2-slp.spec new/yast2-slp-3.1.5/package/yast2-slp.spec --- old/yast2-slp-3.1.4/package/yast2-slp.spec 2014-02-21 15:27:51.000000000 +0100 +++ new/yast2-slp-3.1.5/package/yast2-slp.spec 2014-03-11 10:24:19.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.4/src/modules/SlpService.rb new/yast2-slp-3.1.5/src/modules/SlpService.rb --- old/yast2-slp-3.1.4/src/modules/SlpService.rb 2014-02-19 13:41:13.000000000 +0100 +++ new/yast2-slp-3.1.5/src/modules/SlpService.rb 2014-03-11 10:24:19.000000000 +0100 @@ -155,13 +155,20 @@ end module DnsCache + extend ::Yast::Logger + def self.resolve(ip_address) host = find(ip_address) - return host if host - - host = Resolv.getname(ip_address) - update(ip_address => host) - host + if host.nil? + host = Resolv.getname(ip_address) + update(ip_address => host) + end + rescue StandardError, Timeout::Error => e + log.error( + "Name resolution failed for given SLP service IP address; " + e.message + ) + ensure + return host end def self.entries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.4/test/slp_service_test.rb new/yast2-slp-3.1.5/test/slp_service_test.rb --- old/yast2-slp-3.1.4/test/slp_service_test.rb 2014-02-19 13:41:13.000000000 +0100 +++ new/yast2-slp-3.1.5/test/slp_service_test.rb 2014-03-11 10:24:19.000000000 +0100 @@ -70,6 +70,27 @@ service = Yast::SlpService.find('install.suse', :machine=>'Dell') expect(service).to eq(nil) end + + it "returns discovered service without host name if IP address resolution fails" do + ip_address = '100.100.100.100' + Yast::SlpService.stub(:discover_service).and_return( + [ + { + 'ip' => ip_address, + 'pcFamily' => 'IP', + 'pcHost' => ip_address, + 'pcPort' => 0, + 'pcSrvType' => 'service:install.suse:http', + 'srvurl' => 'service:install.suse:http://10.100.2.16/install/SLP/SLE-10-SP4-SDK-RC3/x86_64/DVD1', + 'lifetime' => 65535 + } + ] + ) + allow(::Resolv).to receive(:getname).and_raise(Resolv::ResolvError) + service = Yast::SlpService.find('install.suse') + expect(service.ip).to eq(ip_address) + expect(service.host).to be_nil + end end describe '#all' do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org