Merge pull request #472 from mchf/master

Merged SLE-12-SP2 into master
yast · Nov 29, 2016 · 857d798 · 857d798
2 parents 05eac3d + 75662a5
commit 857d798
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Nov 29 12:41:40 UTC 2016 - mfilka@suse.com
+
+- bnc#1012581
+  - do not crash with internal error stating undefined method when
+    switching to "Hostname / DNS" tab when the system contains
+    incorrect configuration of DHCLIENT_SET_HOSTNAME
+- 3.2.14
+
 -------------------------------------------------------------------
 Mon Nov 28 21:15:00 UTC 2016 - mfilka@suse.com
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.2.13
+Version:        3.2.14
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/network/services/dns.rb b/src/include/network/services/dns.rb
@@ -427,7 +427,7 @@ def InitDhcpHostname(_key)
       items = []
 
       if !LanItems.valid_dhcp_cfg?
-        fix_dhclient_warning(invalid_dhcp_cfgs)
+        fix_dhclient_warning(LanItems.invalid_dhcp_cfgs)
 
         selected = NO_CHANGE_LABEL
         items << [Item(Id(NO_CHANGE_LABEL), _("keep current settings"), true)]