[yast-commit] [ci_new_pac] JFYI yast2-slp -> sle12

11 Mar 2014

Script 'mail_helper' called by ro
Hello packager,

This is just FYI.  Your package was checked in in distribution "sle12"
by autobuild-member: ro.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-slp -> sle12



## BNC# 867357 : "SCC: no name for 10.120.0.100" (RESOLVED/FIXED)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-slp/yast2-slp.changes	2014-02-24 15:02:09.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-slp/yast2-slp.changes	2014-03-11 11:06:42.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
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-product-creator
- yast2-schema
- yast2-slp
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-slp (Old)
 and      /mounts/work_src_done/SLE12/yast2-slp (BS:build ID:34153 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-slp", Maintainer is "yast-commit@opensuse.org"


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.qtbNJq/_old	2014-03-11 15:47:55.000000000 +0100
+++ /var/tmp/diff_new_pack.qtbNJq/_new	2014-03-11 15:47:55.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:25:07.000000000 +0100
+++ new/yast2-slp-3.1.5/package/yast2-slp.changes	2014-03-11 11:02:18.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:25:07.000000000 +0100
+++ new/yast2-slp-3.1.5/package/yast2-slp.spec	2014-03-11 11:02:18.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-21 15:25:07.000000000 +0100
+++ new/yast2-slp-3.1.5/src/modules/SlpService.rb	2014-03-11 11:02:18.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-21 15:25:07.000000000 +0100
+++ new/yast2-slp-3.1.5/test/slp_service_test.rb	2014-03-11 11:02:18.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

continue with "q"...


Checked in at Tue Mar 11 15:48:04 CET 2014 by ro

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

ro

tags

participants (1)