Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2017-03-29 13:22:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network" Wed Mar 29 13:22:20 2017 rev:370 rq:481973 version:3.2.21 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2017-03-10 20:38:48.880285239 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2017-03-29 13:22:21.867179933 +0200 @@ -1,0 +2,6 @@ +Tue Mar 21 09:24:29 UTC 2017 - jreidinger@suse.com + +- adapt to new version of cfa (new cfa needed for bsc#1023204) +- 3.2.21 + +------------------------------------------------------------------- Old: ---- yast2-network-3.2.20.tar.bz2 New: ---- yast2-network-3.2.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.ddvlQc/_old 2017-03-29 13:22:22.547083778 +0200 +++ /var/tmp/diff_new_pack.ddvlQc/_new 2017-03-29 13:22:22.547083778 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.2.20 +Version: 3.2.21 Release: 0 BuildArch: noarch @@ -46,9 +46,9 @@ Requires: yast2-storage >= 2.21.11 # Packages::vnc_packages Requires: yast2-packager >= 3.1.47 -# cfa for parsing hosts -BuildRequires: rubygem(%rb_default_ruby_abi:cfa) -Requires: rubygem(%rb_default_ruby_abi:cfa) +# cfa for parsing hosts, AugeasTree#unique_id +BuildRequires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0 +Requires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0 # lenses are needed to use cfa BuildRequires: augeas-lenses Requires: augeas-lenses ++++++ yast2-network-3.2.20.tar.bz2 -> yast2-network-3.2.21.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.20/package/yast2-network.changes new/yast2-network-3.2.21/package/yast2-network.changes --- old/yast2-network-3.2.20/package/yast2-network.changes 2017-03-03 12:00:02.764000000 +0100 +++ new/yast2-network-3.2.21/package/yast2-network.changes 2017-03-22 13:09:17.716003918 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Mar 21 09:24:29 UTC 2017 - jreidinger@suse.com + +- adapt to new version of cfa (new cfa needed for bsc#1023204) +- 3.2.21 + +------------------------------------------------------------------- Wed Feb 22 10:49:17 UTC 2017 - mfilka@suse.com - bnc#1020074 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.20/package/yast2-network.spec new/yast2-network-3.2.21/package/yast2-network.spec --- old/yast2-network-3.2.20/package/yast2-network.spec 2017-03-03 12:00:02.768000000 +0100 +++ new/yast2-network-3.2.21/package/yast2-network.spec 2017-03-22 13:09:17.716003918 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.2.20 +Version: 3.2.21 Release: 0 BuildArch: noarch @@ -48,9 +48,9 @@ Requires: yast2-storage >= 2.21.11 # Packages::vnc_packages Requires: yast2-packager >= 3.1.47 -# cfa for parsing hosts -BuildRequires: rubygem(%rb_default_ruby_abi:cfa) -Requires: rubygem(%rb_default_ruby_abi:cfa) +# cfa for parsing hosts, AugeasTree#unique_id +BuildRequires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0 +Requires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0 # lenses are needed to use cfa BuildRequires: augeas-lenses Requires: augeas-lenses diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.20/src/lib/cfa/hosts.rb new/yast2-network-3.2.21/src/lib/cfa/hosts.rb --- old/yast2-network-3.2.20/src/lib/cfa/hosts.rb 2017-03-03 12:00:03.004000000 +0100 +++ new/yast2-network-3.2.21/src/lib/cfa/hosts.rb 2017-03-22 13:09:17.984003918 +0100 @@ -123,7 +123,7 @@ aliases.each do |a| aliases_col.add(a) end - data.add(unique_id, entry_line) + data.add(data.unique_id, entry_line) end # Removes hostname from all entries in hosts table. @@ -193,14 +193,5 @@ result.concat(aliases_for(entry)) result.join(" ") end - - # helper to generate unique id for cfa entry - def unique_id - id = 1 - loop do - return id.to_s unless data[id.to_s] - id += 1 - end - end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.20/test/host_test.rb new/yast2-network-3.2.21/test/host_test.rb --- old/yast2-network-3.2.20/test/host_test.rb 2017-03-03 12:00:03.136000000 +0100 +++ new/yast2-network-3.2.21/test/host_test.rb 2017-03-22 13:09:18.080003918 +0100 @@ -206,7 +206,7 @@ content = file.content - expect(content.lines).to include("127.0.0.2 localmachine.domain.local localmachine\n") + expect(content.lines).to include("127.0.0.2\tlocalmachine.domain.local localmachine\n") end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.20/test/remote_test.rb new/yast2-network-3.2.21/test/remote_test.rb --- old/yast2-network-3.2.20/test/remote_test.rb 2017-03-03 12:00:03.172000000 +0100 +++ new/yast2-network-3.2.21/test/remote_test.rb 2017-03-22 13:09:18.112003918 +0100 @@ -291,9 +291,12 @@ end context "when remote adminitration is being disabled" do - before(:each) do + before do Remote.Disable() allow(Service).to receive(:active?).with("xinetd").and_return(active_xinetd) + # do not call reload or stop + allow(Service).to receive(:Reload).and_return(true) + allow(Service).to receive(:Stop).and_return(true) end context "xinetd is active" do