Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2014-07-23 22:05:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2014-07-18 14:03:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2014-07-23 22:05:41.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 22 14:30:00 CEST 2014 - loci...@suse.com + +- Using new ServicesProposal library to set the sshd service status + for AutoYast export at the end of installation (bnc#887688) +- 3.1.71 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.70.tar.bz2 New: ---- yast2-network-3.1.71.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.1jQpS9/_old 2014-07-23 22:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.1jQpS9/_new 2014-07-23 22:05:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.70 +Version: 3.1.71 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,9 +33,9 @@ BuildRequires: yast2-installation >= 2.15.27 BuildRequires: yast2-testsuite -# yast2 v3.1.11: wicked support -BuildRequires: yast2 >= 3.1.11 -Requires: yast2 >= 3.1.11 +# yast2 v3.1.86: Added ServicesProposal library +BuildRequires: yast2 >= 3.1.86 +Requires: yast2 >= 3.1.86 #netconfig (FaTE #303618) Requires: sysconfig >= 0.80.0 ++++++ yast2-network-3.1.70.tar.bz2 -> yast2-network-3.1.71.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.70/package/yast2-network.changes new/yast2-network-3.1.71/package/yast2-network.changes --- old/yast2-network-3.1.70/package/yast2-network.changes 2014-07-17 15:42:50.000000000 +0200 +++ new/yast2-network-3.1.71/package/yast2-network.changes 2014-07-22 15:28:14.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 22 14:30:00 CEST 2014 - loci...@suse.com + +- Using new ServicesProposal library to set the sshd service status + for AutoYast export at the end of installation (bnc#887688) +- 3.1.71 + +------------------------------------------------------------------- Thu Jul 17 11:07:46 CEST 2014 - snw...@suse.de - Use ProxyURL when reading proxy settings from install.inf. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.70/package/yast2-network.spec new/yast2-network-3.1.71/package/yast2-network.spec --- old/yast2-network-3.1.70/package/yast2-network.spec 2014-07-17 15:42:50.000000000 +0200 +++ new/yast2-network-3.1.71/package/yast2-network.spec 2014-07-22 15:28:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.70 +Version: 3.1.71 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,9 +33,9 @@ BuildRequires: yast2-country BuildRequires: yast2-installation >= 2.15.27 -# yast2 v3.1.11: wicked support -BuildRequires: yast2 >= 3.1.11 -Requires: yast2 >= 3.1.11 +# yast2 v3.1.86: Added ServicesProposal library +BuildRequires: yast2 >= 3.1.86 +Requires: yast2 >= 3.1.86 #netconfig (FaTE #303618) Requires: sysconfig >= 0.80.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.70/src/modules/SuSEFirewall4Network.rb new/yast2-network-3.1.71/src/modules/SuSEFirewall4Network.rb --- old/yast2-network-3.1.70/src/modules/SuSEFirewall4Network.rb 2014-07-17 15:42:50.000000000 +0200 +++ new/yast2-network-3.1.71/src/modules/SuSEFirewall4Network.rb 2014-07-22 15:28:14.000000000 +0200 @@ -41,6 +41,7 @@ Yast.import "SuSEFirewall" Yast.import "SuSEFirewallProposal" Yast.import "Stage" + Yast.import "ServicesProposal" @firewall_enabled_1st_stage = false @ssh_enabled_1st_stage = false @@ -255,6 +256,13 @@ def SetSshdEnabled(enabled) @sshd_enabled = enabled + # bnc#887688 Needed for AutoYast export functionality at the end + # of installation (clone_finish) + enabled ? + ServicesProposal.enable_service('sshd') + : + ServicesProposal.disable_service('sshd') + nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.70/test/Makefile.am new/yast2-network-3.1.71/test/Makefile.am --- old/yast2-network-3.1.70/test/Makefile.am 2014-07-17 15:42:50.000000000 +0200 +++ new/yast2-network-3.1.71/test/Makefile.am 2014-07-22 15:28:14.000000000 +0200 @@ -8,7 +8,8 @@ widgets_test.rb \ install_inf_convertor_test.rb \ lan_items_helpers_test.rb \ - link_handlers_test.rb + link_handlers_test.rb \ + suse_firewall_4_network_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.70/test/suse_firewall_4_network_test.rb new/yast2-network-3.1.71/test/suse_firewall_4_network_test.rb --- old/yast2-network-3.1.70/test/suse_firewall_4_network_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.71/test/suse_firewall_4_network_test.rb 2014-07-22 15:28:14.000000000 +0200 @@ -0,0 +1,26 @@ +#!/usr/bin/env rspec + +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" + +module Yast + import "SuSEFirewall4Network" + import "ServicesProposal" + + describe SuSEFirewall4Network do + describe "#SetSshdEnabled" do + it "sets whether sshd service should be started and caches the information in ServicesProposal" do + SuSEFirewall4Network.SetSshdEnabled(true) + expect(SuSEFirewall4Network.EnabledSshd).to be_true + expect(ServicesProposal.enabled_services.include?('sshd')).to be_true + expect(ServicesProposal.disabled_services.include?('sshd')).to be_false + + SuSEFirewall4Network.SetSshdEnabled(false) + expect(SuSEFirewall4Network.EnabledSshd).to be_false + expect(ServicesProposal.enabled_services.include?('sshd')).to be_false + expect(ServicesProposal.disabled_services.include?('sshd')).to be_true + end + end + end +end -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org