Fixed saving /etc/ntp.conf with certain comments (bsc#1142026)

package/yast2-ntp-client.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 02 15:16:17 CEST 2019 - aschnell@suse.com
+
+- Fixed saving /etc/ntp.conf with certain comments (bsc#1142026)
+- 3.2.19
+
 -------------------------------------------------------------------
 Thu Dec 13 12:45:27 UTC 2018 - knut.anderssen@suse.com
 

package/yast2-ntp-client.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        3.2.18
+Version:        3.2.19
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0+

src/lib/cfa/ntp_conf.rb

@@ -97,8 +97,8 @@ def save
         comments = r.augeas[:multiline].split("\n")
         matcher = Matcher.new(key: r.augeas[:key], value_matcher: r.augeas[:value])
         placer = BeforePlacer.new(matcher)
-        comments.each do |c|
-          data.add("#comment[]", c, placer)
+        comments.each do |comment|
+          data.add("#comment[]", comment.strip, placer)
         end
       end
       super

src/modules/NtpClient.rb

@@ -1021,7 +1021,8 @@ def AutoPackages
     # Remove blank spaces in values
     #
     # @note to avoid augeas parsing errors, comments should be sanitized by
-    #   removing blank spaces at the beginning and adding line break.
+    #   removing blank spaces at the beginning and adding line break. Further
+    #   sanitation is done in NtpConf.save.
     def sanitize_record(record)
       sanitized = record.dup
       sanitized.each do |key, value|

test/cfa/ntp_conf_test.rb

@@ -94,6 +94,19 @@ def ntp_conf(file)
         expect(file.content.lines).to include("#test comment 2\n")
         expect(file.content.lines).to include("#test comment3\n")
       end
+
+      # see bsc #1142026
+      it "can write multi lines comments with unstripped whitespaces from autoyast profiles" do
+        record = CFA::NtpConf::ServerRecord.new
+        record.value = "4.pool.ntp.org"
+        record.comment = " test comment 4 \n \n test comment 5 "
+        ntp.records << record
+        expect(record.comment).to eq " test comment 4 \n \n test comment 5 "
+        ntp.save
+        expect(file.content.lines).to include("#test comment 4\n")
+        expect(file.content.lines).to include("#test comment 5\n")
+        expect(file.content.lines).to include("server 4.pool.ntp.org\n")
+      end
     end
 
     context "when a record is deleted" do