Merge pull request #15 from mvidner/master

A syntax fix + test case for a leftover in pull request #13. Comments resolved personally
yast · Aug 20, 2012 · 7933a19 · 7933a19
2 parents dc9147c + 62e76ca
commit 7933a19
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/src/lan/hardware.ycp b/src/lan/hardware.ycp
@@ -12,6 +12,7 @@
 textdomain "network";
 
 import "Arch";
+import "CWM";
 import "Label";
 import "Lan";
 import "NetworkInterfaces";
@@ -80,7 +81,7 @@ configured with the same module name, the options will be merged while saving.</
 
 _("<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n");
 
-    if( isNewDevice() && !Arch::s390() ))
+    if( isNewDevice() && !Arch::s390() )
     {
 
     /* Manual dialog help 4/4 */

diff --git a/testsuite/tests/include.err b/testsuite/tests/include.err
diff --git a/testsuite/tests/include.out b/testsuite/tests/include.out
diff --git a/testsuite/tests/include.ycp b/testsuite/tests/include.ycp
@@ -0,0 +1,4 @@
+// A basic syntax check
+{
+	include "network/lan/hardware.ycp";
+}