Merge pull request #47 from yast/fix_options_check_sp4

Fix check of 'set' and 'key' options

.gitignore

@@ -19,16 +19,18 @@ dhcp-server.pot
 autom4te.cache
 Makefile.am.common
 *.ami
-doc/autodocs/*.html
+doc/autodocs/
 /testsuite/config/
 /testsuite/run/
 doc/autodocs/.yardoc/
 doc/autodocs/Yast/
 doc/autodocs/css/
 doc/autodocs/js/
 testsuite/*.exp
-testsuite/tmp.err.*
+testsuite/*.err.*
 testsuite/tmp.out.*
 testsuite/*.log
 testsuite/yast2-dhcp-server.sum
 testsuite/yast2-dhcp-server.test/
+.yardoc
+/coverage

.yardopts

@@ -0,0 +1,7 @@
+--no-private
+--markup markdown
+--protected
+--readme README.md
+--output-dir ./doc/autodocs
+--files *.md
+src/**/*.rb

package/yast2-dhcp-server.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug  6 11:58:58 UTC 2019 - Knut Anderssen <kanderssen@suse.com>
+
+- Fix the check of the 'key' and 'value' options when modifying the
+  configuration using the CLI. (bsc#1144351)
+- 3.2.3
+
 -------------------------------------------------------------------
 Wed Jan 18 11:52:24 UTC 2017 - lslezak@suse.cz
 

package/yast2-dhcp-server.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dhcp-server
-Version:        3.2.2
+Version:        3.2.3
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/include/dhcp-server/commandline.rb

@@ -439,8 +439,8 @@ def OptionsHandler(options)
         return false
       end
       if Builtins.haskey(options, "set")
-        key = Ops.get_string(options2, "key", "")
-        value = Ops.get_string(options2, "value", "")
+        key = Ops.get_string(options, "key", "")
+        value = Ops.get_string(options, "value", "")
         if key == ""
           # command-line error report
           CommandLine.Print(_("Option key must be set."))