Hello community,
here is the log from the commit of package yast2-ntp-client for
openSUSE:Factory checked in at 2019-10-03 14:06:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ntp-client"
Thu Oct 3 14:06:59 2019 rev:114 rq:734602 version:4.2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes
2019-09-07 11:27:02.866482109 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-ntp-client.new.2352/yast2-ntp-client.changes
2019-10-03 14:07:01.200476816 +0200
@@ -1,0 +2,7 @@
+Wed Oct 2 11:42:34 UTC 2019 - Josef Reidinger <[email protected]>
+
+- implement starting chrony-wait only if product require it
+ (bsc#1145193)
+- 4.2.4
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-4.2.3.tar.bz2
New:
----
yast2-ntp-client-4.2.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.Znr8xD/_old 2019-10-03 14:07:01.616475745 +0200
+++ /var/tmp/diff_new_pack.Znr8xD/_new 2019-10-03 14:07:01.624475725 +0200
@@ -17,7 +17,7 @@
Name: yast2-ntp-client
-Version: 4.2.3
+Version: 4.2.4
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0-or-later
++++++ yast2-ntp-client-4.2.3.tar.bz2 -> yast2-ntp-client-4.2.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ntp-client-4.2.3/package/yast2-ntp-client.changes
new/yast2-ntp-client-4.2.4/package/yast2-ntp-client.changes
--- old/yast2-ntp-client-4.2.3/package/yast2-ntp-client.changes 2019-08-30
11:51:10.000000000 +0200
+++ new/yast2-ntp-client-4.2.4/package/yast2-ntp-client.changes 2019-10-02
14:34:59.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Oct 2 11:42:34 UTC 2019 - Josef Reidinger <[email protected]>
+
+- implement starting chrony-wait only if product require it
+ (bsc#1145193)
+- 4.2.4
+
+-------------------------------------------------------------------
Fri Aug 30 09:42:29 UTC 2019 - Dominique Leuenberger <[email protected]>
- Add cron BuildRequires: needed for /etc/cron.* ownership. As
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ntp-client-4.2.3/package/yast2-ntp-client.spec
new/yast2-ntp-client-4.2.4/package/yast2-ntp-client.spec
--- old/yast2-ntp-client-4.2.3/package/yast2-ntp-client.spec 2019-08-30
11:51:10.000000000 +0200
+++ new/yast2-ntp-client-4.2.4/package/yast2-ntp-client.spec 2019-10-02
14:34:59.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-ntp-client
-Version: 4.2.3
+Version: 4.2.4
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ntp-client-4.2.3/src/modules/NtpClient.rb
new/yast2-ntp-client-4.2.4/src/modules/NtpClient.rb
--- old/yast2-ntp-client-4.2.3/src/modules/NtpClient.rb 2019-08-30
11:51:10.000000000 +0200
+++ new/yast2-ntp-client-4.2.4/src/modules/NtpClient.rb 2019-10-02
14:34:59.000000000 +0200
@@ -64,6 +64,7 @@
Yast.import "PackageSystem"
Yast.import "Popup"
Yast.import "Progress"
+ Yast.import "ProductFeatures"
Yast.import "Report"
Yast.import "Service"
Yast.import "SLPAPI"
@@ -808,17 +809,19 @@
# * When enabling, it tries to restart the services unless it's in write
# only mode.
def check_service
+ # fallbacks to false if not defined
+ wait_service_required = ProductFeatures.GetBooleanFeature("globals",
"precise_time")
if @run_service
# Enable and run services
if !Service.Enable(@service_name)
Report.Error(Message.CannotAdjustService(@service_name))
- elsif !Service.Enable(@wait_service_name)
+ elsif wait_service_required && !Service.Enable(@wait_service_name)
Report.Error(Message.CannotAdjustService(@wait_service_name))
end
if !@write_only
if !Service.Restart(@service_name)
Report.Error(_("Cannot restart \"%s\" service.") % @service_name)
- elsif !Service.Restart(@wait_service_name)
+ elsif wait_service_required && !Service.Restart(@wait_service_name)
Report.Error(_("Cannot restart \"%s\" service.") %
@wait_service_name)
end
end
@@ -826,6 +829,7 @@
# Disable and stop services
if !Service.Disable(@service_name)
Report.Error(Message.CannotAdjustService(@service_name))
+ # disable and stop always as wait without chrony does not make sense
elsif !Service.Disable(@wait_service_name)
Report.Error(Message.CannotAdjustService(@wait_service_name))
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ntp-client-4.2.3/test/ntp_client_test.rb
new/yast2-ntp-client-4.2.4/test/ntp_client_test.rb
--- old/yast2-ntp-client-4.2.3/test/ntp_client_test.rb 2019-08-30
11:51:10.000000000 +0200
+++ new/yast2-ntp-client-4.2.4/test/ntp_client_test.rb 2019-10-02
14:34:59.000000000 +0200
@@ -289,14 +289,36 @@
subject.write_only = false
end
- it "enables and restarts services" do
- allow(subject).to receive(:check_service).and_call_original
- expect(Yast::Service).to
receive(:Enable).with("chronyd").and_return(true)
- expect(Yast::Service).to
receive(:Enable).with("chrony-wait").and_return(true)
- expect(Yast::Service).to
receive(:Restart).with("chronyd").and_return(true)
- expect(Yast::Service).to
receive(:Restart).with("chrony-wait").and_return(true)
+ context "when product require precise time" do
+ before do
+ allow(Yast::ProductFeatures).to
receive(:GetBooleanFeature).and_return(true)
+ end
- subject.Write
+ it "enables and restarts services including chrony-wait" do
+ allow(subject).to receive(:check_service).and_call_original
+ expect(Yast::Service).to
receive(:Enable).with("chronyd").and_return(true)
+ expect(Yast::Service).to
receive(:Enable).with("chrony-wait").and_return(true)
+ expect(Yast::Service).to
receive(:Restart).with("chronyd").and_return(true)
+ expect(Yast::Service).to
receive(:Restart).with("chrony-wait").and_return(true)
+
+ subject.Write
+ end
+ end
+
+ context "when product does not require precise time" do
+ before do
+ allow(Yast::ProductFeatures).to
receive(:GetBooleanFeature).and_return(false)
+ end
+
+ it "enables and restarts services without chrony-wait" do
+ allow(subject).to receive(:check_service).and_call_original
+ expect(Yast::Service).to
receive(:Enable).with("chronyd").and_return(true)
+ expect(Yast::Service).to_not receive(:Enable).with("chrony-wait")
+ expect(Yast::Service).to
receive(:Restart).with("chronyd").and_return(true)
+ expect(Yast::Service).to_not receive(:Restart).with("chrony-wait")
+
+ subject.Write
+ end
end
end
