Hello community, here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2015-07-05 17:53:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old) and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ntp-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes 2015-05-15 09:54:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes 2015-07-05 17:53:06.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 26 11:34:00 UTC 2015 - [email protected] + +- do not crash if ntp is not installed to target system during + cloning (bnc#936178) +- 3.1.15 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-3.1.14.tar.bz2 New: ---- yast2-ntp-client-3.1.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.2yJkSm/_old 2015-07-05 17:53:07.000000000 +0200 +++ /var/tmp/diff_new_pack.2yJkSm/_new 2015-07-05 17:53:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.14 +Version: 3.1.15 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ ++++++ yast2-ntp-client-3.1.14.tar.bz2 -> yast2-ntp-client-3.1.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.14/package/yast2-ntp-client.changes new/yast2-ntp-client-3.1.15/package/yast2-ntp-client.changes --- old/yast2-ntp-client-3.1.14/package/yast2-ntp-client.changes 2015-05-11 12:20:09.000000000 +0200 +++ new/yast2-ntp-client-3.1.15/package/yast2-ntp-client.changes 2015-07-03 11:30:36.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 26 11:34:00 UTC 2015 - [email protected] + +- do not crash if ntp is not installed to target system during + cloning (bnc#936178) +- 3.1.15 + +------------------------------------------------------------------- Fri May 8 09:39:11 CEST 2015 - [email protected] - AutoYaST (bnc#928987): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.14/package/yast2-ntp-client.spec new/yast2-ntp-client-3.1.15/package/yast2-ntp-client.spec --- old/yast2-ntp-client-3.1.14/package/yast2-ntp-client.spec 2015-05-11 12:20:09.000000000 +0200 +++ new/yast2-ntp-client-3.1.15/package/yast2-ntp-client.spec 2015-07-03 11:30:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.1.14 +Version: 3.1.15 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.14/src/clients/ntp-client_auto.rb new/yast2-ntp-client-3.1.15/src/clients/ntp-client_auto.rb --- old/yast2-ntp-client-3.1.14/src/clients/ntp-client_auto.rb 2015-05-11 12:20:09.000000000 +0200 +++ new/yast2-ntp-client-3.1.15/src/clients/ntp-client_auto.rb 2015-07-03 11:30:36.000000000 +0200 @@ -76,9 +76,15 @@ # cloning the just installed system if Mode.config && Stage.initial ntp_conf = "/etc/ntp.conf" + installed_ntp_conf = File.join(Installation.destdir, ntp_conf) + # if ntp is not installed at all we cannot copy it, so return empty values + if !::File.exist?(installed_ntp_conf) + Builtins.y2milestone("Ntp is not installed, so return empty hash") + return {} + end # copy ntp.conf from the installed system to # running system - ::FileUtils.cp File.join(Installation.destdir, ntp_conf), ntp_conf + ::FileUtils.cp installed_ntp_conf, ntp_conf # read ntp.conf NtpClient.ProcessNtpConf end
