Merge 51f1146 into 2d75ee5

yast · Jan 23, 2020 · 1e763ea · 1e763ea
2 parents 2d75ee5 + 51f1146
commit 1e763ea
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/package/yast2-ftp-server.changes b/package/yast2-ftp-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 23 09:02:55 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- fix return code of CLI show command (bsc#1143193)
+- 4.2.4
+
 -------------------------------------------------------------------
 Mon Dec 30 16:11:40 UTC 2019 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-ftp-server.spec b/package/yast2-ftp-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ftp-server
-Version:        4.2.3
+Version:        4.2.4
 Release:        0
 Summary:        YaST2 - FTP configuration
 License:        GPL-2.0-only
@@ -27,14 +27,14 @@ Url:            https://github.com/yast/yast-ftp-server
 Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  update-desktop-files
-# Yast2::Systemd::Service
-BuildRequires:  yast2 >= 4.1.3
+# Yast2::CommandLine readonly parameter
+BuildRequires:  yast2 >= 4.2.57
 BuildRequires:  yast2-devtools >= 4.2.2
 BuildRequires:  rubygem(%rb_default_ruby_abi:rspec)
 BuildRequires:  rubygem(%rb_default_ruby_abi:yast-rake)
 
-# Yast2::Systemd::Service
-Requires:       yast2 >= 4.1.3
+# Yast2::CommandLine readonly parameter
+Requires:       yast2 >= 4.2.57
 Requires:       yast2-ruby-bindings >= 1.0.0
 
 BuildArch:      noarch

diff --git a/src/lib/y2ftp/clients/ftp_server.rb b/src/lib/y2ftp/clients/ftp_server.rb
@@ -55,10 +55,11 @@ def run
           "finish"     => fun_ref(Yast::FtpServer.method(:Write), "boolean ()"),
           "actions"    => {
             "show"            => {
-              "handler" => fun_ref(method(:FTPdCMDShow), "boolean (map)"),
+              "handler"  => fun_ref(method(:FTPdCMDShow), "boolean (map)"),
               # TRANSLATORS: CommandLine help
-              "help"    => _("Display settings"),
-              "example" => ["show"]
+              "help"     => _("Display settings"),
+              "example"  => ["show"],
+              "readonly" => true
             },
             "startup"         => {
               "handler" => fun_ref(method(:FTPdCMDStartup), "boolean (map)"),
@@ -543,7 +544,7 @@ def FTPdCMDShow(_options)
         end
 
         CommandLine.Print("")
-        false
+        true
       end
 
       def FTPdCMDStartup(options)