Merge pull request #60 from teclator/nil_comments

Convert ntp record's comment to string to avoid nil values (bsc#977610)
yast · Jun 14, 2016 · c30a98c · c30a98c
2 parents 5708d19 + fae50a8
commit c30a98c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/package/yast2-ntp-client.changes b/package/yast2-ntp-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 14 06:54:54 UTC 2016 - kanderssen@suse.com
+
+- Fix handling of NTP records without comments (bsc#977610)
+- 3.1.26
+
 -------------------------------------------------------------------
 Thu Jun  2 07:40:56 UTC 2016 - kanderssen@suse.com
 

diff --git a/package/yast2-ntp-client.spec b/package/yast2-ntp-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        3.1.25
+Version:        3.1.26
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0+

diff --git a/src/modules/NtpClient.rb b/src/modules/NtpClient.rb
@@ -1158,23 +1158,23 @@ def update_cron_settings
 
     def record_to_h(record)
       {
-        "comment" => record["comment"],
+        "comment" => record["comment"].to_s,
         "kind"    => "value",
         "name"    => record["type"] == "__clock" ? "server" : record["type"],
         "type"    => 0,
-        "value"   => "#{record["address"]} #{record["options"]}"
+        "value"   => "#{record["address"]} #{record["options"]}".strip
       }
     end
 
     # Parse fudge options of given record and returns a new fudge record for
     # write
     def fugde_options_to_h(record)
       {
-        "comment" => record["fudge_comment"],
+        "comment" => record["fudge_comment"].to_s,
         "kind"    => "value",
         "name"    => "fudge",
         "type"    => 0,
-        "value"   => "#{record["address"]} #{record["fudge_options"]}"
+        "value"   => "#{record["address"]} #{record["fudge_options"]}".strip
       }
     end