Hello community, here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2017-01-31 12:32:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2017-01-10 10:32:51.925196496 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes 2017-02-03 20:07:49.655388997 +0100 @@ -1,0 +2,7 @@ +Thu Jan 26 10:17:50 CET 2017 - [email protected] + +- AutoYaST writing settings crash: Initialize CFA instance + correctly (bnc#1019292) +- 3.2.5 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-3.2.4.tar.bz2 New: ---- yast2-ntp-client-3.2.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.iTHpRo/_old 2017-02-03 20:07:50.139320879 +0100 +++ /var/tmp/diff_new_pack.iTHpRo/_new 2017-02-03 20:07:50.143320317 +0100 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.2.4 +Version: 3.2.5 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0+ ++++++ yast2-ntp-client-3.2.4.tar.bz2 -> yast2-ntp-client-3.2.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.2.4/.travis.yml new/yast2-ntp-client-3.2.5/.travis.yml --- old/yast2-ntp-client-3.2.4/.travis.yml 2017-01-04 10:48:19.453631809 +0100 +++ new/yast2-ntp-client-3.2.5/.travis.yml 2017-01-26 13:07:07.123986125 +0100 @@ -1,11 +1,11 @@ sudo: required -language: ruby +language: bash services: - docker before_install: - - docker build -t yast-test-image . + - docker build -t yast-ntp-client-image . script: - # the "yast-travis" script is included in the base yastdevel/ruby-tw image - # see https://github.com/yast/docker-yast-ruby-tw/blob/master/yast-travis - - docker run -it -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-test-image yast-travis + # the "yast-travis-ruby" script is included in the base yastdevel/ruby image + # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-ntp-client-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.2.4/Dockerfile new/yast2-ntp-client-3.2.5/Dockerfile --- old/yast2-ntp-client-3.2.4/Dockerfile 2017-01-04 10:48:19.453631809 +0100 +++ new/yast2-ntp-client-3.2.5/Dockerfile 2017-01-26 13:07:07.135986125 +0100 @@ -1,3 +1,3 @@ -FROM yastdevel/ruby-tw -COPY . /tmp/sources +FROM yastdevel/ruby +COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.2.4/package/yast2-ntp-client.changes new/yast2-ntp-client-3.2.5/package/yast2-ntp-client.changes --- old/yast2-ntp-client-3.2.4/package/yast2-ntp-client.changes 2017-01-04 10:48:19.457631809 +0100 +++ new/yast2-ntp-client-3.2.5/package/yast2-ntp-client.changes 2017-01-26 13:07:07.135986125 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 26 10:17:50 CET 2017 - [email protected] + +- AutoYaST writing settings crash: Initialize CFA instance + correctly (bnc#1019292) +- 3.2.5 + +------------------------------------------------------------------- Wed Jan 4 08:18:24 UTC 2017 - [email protected] - Update the Rubocop style to version 0.41.2 (to match the other diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.2.4/package/yast2-ntp-client.spec new/yast2-ntp-client-3.2.5/package/yast2-ntp-client.spec --- old/yast2-ntp-client-3.2.4/package/yast2-ntp-client.spec 2017-01-04 10:48:19.457631809 +0100 +++ new/yast2-ntp-client-3.2.5/package/yast2-ntp-client.spec 2017-01-26 13:07:07.139986125 +0100 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 3.2.4 +Version: 3.2.5 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.2.4/src/modules/NtpClient.rb new/yast2-ntp-client-3.2.5/src/modules/NtpClient.rb --- old/yast2-ntp-client-3.2.4/src/modules/NtpClient.rb 2017-01-04 10:48:19.469631809 +0100 +++ new/yast2-ntp-client-3.2.5/src/modules/NtpClient.rb 2017-01-26 13:07:07.211986125 +0100 @@ -303,8 +303,7 @@ end begin - @ntp_conf = CFA::NtpConf.new - @ntp_conf.load + ntp_conf.load rescue StandardError => e log.error("Failed to read #{NTP_FILE}: #{e.message}") return false @@ -312,12 +311,12 @@ load_ntp_records - log.info("Raw ntp conf #{@ntp_conf.raw}") + log.info("Raw ntp conf #{ntp_conf.raw}") true end def load_ntp_records - @ntp_records = @ntp_conf.records.map do |record| + @ntp_records = ntp_conf.records.map do |record| { "type" => record.type, "address" => record.value, @@ -328,7 +327,7 @@ end end - # Read and parse /etc.ntp.conf + # Read and parse /etc/ntp.conf # @return true on success def ProcessNtpConf if @config_has_been_read @@ -414,7 +413,7 @@ "" ) ) - m["cfa_fudge_record"] = @ntp_conf.records.find do |record| + m["cfa_fudge_record"] = ntp_conf.records.find do |record| record.type == "fudge" && record.value == m["address"] end end @@ -1101,15 +1100,15 @@ records_for_write.each do |record| unless record["cfa_record"] record["cfa_record"] = CFA::NtpConf::Record.record_class(record["type"]).new - @ntp_conf.records << record["cfa_record"] + ntp_conf.records << record["cfa_record"] end update_cfa_record(record) end - @ntp_conf.records.delete_if { |record| @deleted_records.include?(record) } + ntp_conf.records.delete_if { |record| @deleted_records.include?(record) } begin - @ntp_conf.save + ntp_conf.save rescue StandardError => e log.error("Failed to write #{NTP_FILE}: #{e.message}") end @@ -1310,6 +1309,11 @@ @ntp_servers[server["address"].to_s] = server end + # CFA instance for reading/writing /etc/ntp.conf + def ntp_conf + @ntp_conf ||= CFA::NtpConf.new + end + publish variable: :AbortFunction, type: "boolean ()" publish variable: :modified, type: "boolean" publish variable: :write_only, type: "boolean"
