Hello community,
here is the log from the commit of package yast2-samba-server for openSUSE:Factory checked in at 2018-11-01 18:59:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-server"
Thu Nov 1 18:59:35 2018 rev:81 rq:642420 version:4.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-server/yast2-samba-server.changes 2018-09-04 22:49:58.379727247 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-samba-server.new/yast2-samba-server.changes 2018-11-01 18:59:38.981991986 +0100
@@ -1,0 +2,12 @@
+Tue Oct 16 16:51:50 CEST 2018 - schubi@suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Sep 5 10:24:26 UTC 2018 - Samuel Cabrero
+
+- Fix configuration not saved after new service status management
+ (bsc#1106876)
+- 4.1.1
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-server-4.1.0.tar.bz2
New:
----
yast2-samba-server-4.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.Qiguhh/_old 2018-11-01 18:59:39.473992029 +0100
+++ /var/tmp/diff_new_pack.Qiguhh/_new 2018-11-01 18:59:39.477992029 +0100
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 4.1.0
+Version: 4.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -84,5 +84,6 @@
%{yast_desktopdir}/samba-server.desktop
%{yast_schemadir}/autoyast/rnc/samba-server.rnc
%doc %{yast_docdir}
+%license COPYING
%changelog
++++++ yast2-samba-server-4.1.0.tar.bz2 -> yast2-samba-server-4.1.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.1.0/package/yast2-samba-server.changes new/yast2-samba-server-4.1.1/package/yast2-samba-server.changes
--- old/yast2-samba-server-4.1.0/package/yast2-samba-server.changes 2018-08-21 17:51:44.000000000 +0200
+++ new/yast2-samba-server-4.1.1/package/yast2-samba-server.changes 2018-10-16 17:44:13.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Tue Oct 16 16:51:50 CEST 2018 - schubi@suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Sep 5 10:24:26 UTC 2018 - Samuel Cabrero
+
+- Fix configuration not saved after new service status management
+ (bsc#1106876)
+- 4.1.1
+
+-------------------------------------------------------------------
Mon Aug 20 16:09:08 CEST 2018 - schubi@suse.de
- Switched license in spec file from SPDX2 to SPDX3 format.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.1.0/package/yast2-samba-server.spec new/yast2-samba-server-4.1.1/package/yast2-samba-server.spec
--- old/yast2-samba-server-4.1.0/package/yast2-samba-server.spec 2018-08-21 17:51:44.000000000 +0200
+++ new/yast2-samba-server-4.1.1/package/yast2-samba-server.spec 2018-10-16 17:44:13.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 4.1.0
+Version: 4.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -85,3 +85,4 @@
%{yast_desktopdir}/samba-server.desktop
%{yast_schemadir}/autoyast/rnc/samba-server.rnc
%doc %{yast_docdir}
+%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.1.0/src/include/samba-server/complex.rb new/yast2-samba-server-4.1.1/src/include/samba-server/complex.rb
--- old/yast2-samba-server-4.1.0/src/include/samba-server/complex.rb 2018-08-21 17:51:44.000000000 +0200
+++ new/yast2-samba-server-4.1.1/src/include/samba-server/complex.rb 2018-10-16 17:44:13.000000000 +0200
@@ -114,23 +114,15 @@
# Saves service status (start mode and starts/stops the service)
#
- # @note For AutoYaST and for command line actions, it uses the old way for
- # backward compatibility, see {SambaServer#Write}. When the service is
- # configured using the UI, it is directly saved. See
- # {Yast2::SystemService#save}.
- #
# @param switch_to_reload [Boolean] indicates if restart action must be
# replaced with reload. See the Bugzilla #120080 stated in #WriteDialog
# comments
#
# @return [Boolean] true if service is saved successfully; false otherwise
def save_status(switch_to_reload)
- if Mode.auto || Mode.commandline
- SambaServer.Write(false)
- else
- services.reload if services.action == :restart && switch_to_reload
- services.save
- end
+ return false unless SambaServer.Write(false)
+ services.reload if services.action == :restart && switch_to_reload
+ services.save
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.1.0/src/modules/SambaServer.pm new/yast2-samba-server-4.1.1/src/modules/SambaServer.pm
--- old/yast2-samba-server-4.1.0/src/modules/SambaServer.pm 2018-08-21 17:51:44.000000000 +0200
+++ new/yast2-samba-server-4.1.1/src/modules/SambaServer.pm 2018-10-16 17:44:13.000000000 +0200
@@ -263,13 +263,10 @@
my $caption = __("Saving Samba Server Configuration");
# We do not set help text here, because it was set outside
- Progress->New($caption, " ", 5, [
+ Progress->New($caption, " ", 4, [
# translators: write progress stage
_("Write global settings"),
# translators: write progress stage
- ( !SambaService->GetServiceAutoStart() ? _("Disable Samba services")
- # translators: write progress stage
- : _("Enable Samba services") ),
# translators: write progress stage
_("Write back-end settings"),
# translators: write progress stage
@@ -280,10 +277,6 @@
# translators: write progress step
_("Writing global settings..."),
# translators: write progress step
- ! SambaService->GetServiceAutoStart() ? _("Disabling Samba services...")
- # translators: write progress step
- : _("Enabling Samba services..."),
- # translators: write progress step
_("Writing back-end settings..."),
# translators: write progress step
_("Writing Samba accounts..."),
@@ -320,24 +313,17 @@
SCR->Execute(".target.bash", "touch " . DONE_ONCE_FILE);
# write samba shares feature, only write => 1
Samba->WriteShares();
-
- # 2: write services settings
- Progress->NextStage();
- SambaService->Write();
- # 3: write backends settings && write trusted domains
+ # 2: write backends settings && write trusted domains
Progress->NextStage();
SambaBackend->Write();
SambaTrustDom->Write();
-
- # 4: write accounts
+
+ # 3: write accounts
Progress->NextStage();
SambaAccounts->Write();
- # 4.5: start, stop, reload service
- SambaService->StartStopReload();
-
- # 5: save firewall settings
+ # 4: save firewall settings
Progress->NextStage();
my $po = Progress->set(0);
FirewalldWrapper->write();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.1.0/test/dialog_complex_test.rb new/yast2-samba-server-4.1.1/test/dialog_complex_test.rb
--- old/yast2-samba-server-4.1.0/test/dialog_complex_test.rb 2018-08-21 17:51:44.000000000 +0200
+++ new/yast2-samba-server-4.1.1/test/dialog_complex_test.rb 2018-10-16 17:44:13.000000000 +0200
@@ -123,64 +123,86 @@
end
context "when running in UI mode" do
- it "saves the system service" do
- expect(services).to receive(:save)
+ context "and fails written configuration" do
+ before do
+ allow(Yast::SambaServer).to receive(:Write).and_return(false)
- samba.WriteDialog
- end
+ it "does not save the system service" do
+ expect(services).to_not receive(:save)
+
+ samba.WriteDialog
+ end
- it "returns :next when sevice is saved successfully" do
- expect(samba.WriteDialog).to eq(:next)
+ it "returns :abort" do
+ expect(samba.WriteDialog).to eq(:abort)
+ end
+ end
end
- it "returns :abort when fails saving the service" do
- allow(services).to receive(:save).and_return(false)
+ context "and configuration is written" do
+ before do
+ allow(Yast::SambaServer).to receive(:Write).and_return(true)
+ end
- expect(samba.WriteDialog).to eq(:abort)
- end
+ it "saves the system service" do
+ expect(services).to receive(:save)
- context "and action is :restart" do
- let(:action) { :restart }
+ samba.WriteDialog
+ end
- context "but the service is already running" do
- let(:service_running) { true }
- let(:service_on_boot) { true }
-
- context "with connected users" do
- it "changes action to :reload" do
- expect(services).to receive(:reload)
+ it "returns :next when sevice is saved successfully" do
+ expect(samba.WriteDialog).to eq(:next)
+ end
- samba.WriteDialog
- end
+ it "returns :abort when fails saving the service" do
+ allow(services).to receive(:save).and_return(false)
- it "reports a message" do
- allow(services).to receive(:reload)
- expect(Yast::Report).to receive(:Message)
+ expect(samba.WriteDialog).to eq(:abort)
+ end
- samba.WriteDialog
+ context "and action is :restart" do
+ let(:action) { :restart }
+
+ context "but the service is already running" do
+ let(:service_running) { true }
+ let(:service_on_boot) { true }
+
+ context "with connected users" do
+ it "changes action to :reload" do
+ expect(services).to receive(:reload)
+
+ samba.WriteDialog
+ end
+
+ it "reports a message" do
+ allow(services).to receive(:reload)
+ expect(Yast::Report).to receive(:Message)
+
+ samba.WriteDialog
+ end
end
- end
- context "without connected users" do
- let(:connected_users) { [] }
+ context "without connected users" do
+ let(:connected_users) { [] }
- it "performs the requested action" do
- expect(services).to_not receive(:reload)
+ it "performs the requested action" do
+ expect(services).to_not receive(:reload)
- samba.WriteDialog
+ samba.WriteDialog
+ end
end
end
end
- end
- context "and action is NOT :restart" do
- let (:action) { :reload }
+ context "and action is NOT :restart" do
+ let (:action) { :reload }
- context "and there are connected users" do
- it "does not report message" do
- expect(Yast::Report).to_not receive(:Message)
+ context "and there are connected users" do
+ it "does not report message" do
+ expect(Yast::Report).to_not receive(:Message)
- samba.WriteDialog
+ samba.WriteDialog
+ end
end
end
end