Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cli #66

Merged
merged 5 commits into from
Jan 23, 2020
Merged

Fix cli #66

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ee7639
fix return code of CLI show command (bsc#1143193)
jreidinger Jan 23, 2020
e5b7818
changes
jreidinger Jan 23, 2020
51f1146
make rubocop happy
jreidinger Jan 23, 2020
f82de4b
Update package/yast2-ftp-server.changes
jreidinger Jan 23, 2020
2956ac0
add test for cli show
jreidinger Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions package/yast2-ftp-server.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
jreidinger marked this conversation as resolved.
Show resolved Hide resolved
- 4.2.4

-------------------------------------------------------------------
Mon Dec 30 16:11:40 UTC 2019 - Josef Reidinger <jreidinger@suse.com>

Expand Down
10 changes: 5 additions & 5 deletions package/yast2-ftp-server.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 5 additions & 4 deletions src/lib/y2ftp/clients/ftp_server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"),
Expand Down Expand Up @@ -543,7 +544,7 @@ def FTPdCMDShow(_options)
end

CommandLine.Print("")
false
true
dgdavid marked this conversation as resolved.
Show resolved Hide resolved
end

def FTPdCMDStartup(options)
Expand Down