Merge pull request #209 from mchf/Code-11-SP3

disable '-o' option for dummy module if hwcfg widget doesn't exist (bnc#...
yast · Jun 9, 2014 · 8f64ca6 · 8f64ca6
2 parents 5345220 + 46faeef
commit 8f64ca6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.198
+2.17.199
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun  9 07:21:45 UTC 2014 - mfilka@suse.com
+
+- bnc#840565
+  - configuring dummy netwok interface error disable '-o' option
+    for dummy module (ported from OS: bnc#767946) hwcfg widget
+    doesn't exist
+- 2.17.199
+
 -------------------------------------------------------------------
 Wed Mar 26 07:16:14 UTC 2014 - mfilka@suse.com
 

diff --git a/src/lan/hardware.ycp b/src/lan/hardware.ycp
@@ -539,10 +539,14 @@ symbol handleHW (string key, map event) {
 	    }
 	    else if (hardware["type"]:"" == "dummy") // #44582
 	    {
-		hardware["hwcfg"] = (string) UI::QueryWidget (`id (`hwcfg), `Value);
-
 		hardware["modul"] = "dummy";
-		hardware["options"] = sformat ("-o dummy-%1", hardware["hwcfg"]:"");
+
+                if( UI::WidgetExists( `id( `hwcfg))) // bnc#767946
+                {
+		    hardware["hwcfg"] = (string) UI::QueryWidget (`id (`hwcfg), `Value);
+		    hardware["options"] = sformat ("-o dummy-%1", hardware["hwcfg"]:"");
+                }
+
 		UI::ChangeWidget(`id(`modul), `Value, hardware["modul"]:"");
 		UI::ChangeWidget(`id(`options), `Value, hardware["options"]:"");
 	    }