Hello community, here is the log from the commit of package yast2-ftp-server for openSUSE:Factory checked in at 2020-01-24 14:10:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ftp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-ftp-server.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ftp-server" Fri Jan 24 14:10:17 2020 rev:70 rq:766608 version:4.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ftp-server/yast2-ftp-server.changes 2020-01-04 19:20:57.741127164 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ftp-server.new.26092/yast2-ftp-server.changes 2020-01-24 14:10:29.370395782 +0100 @@ -1,0 +2,6 @@ +Thu Jan 23 09:02:55 UTC 2020 - Josef Reidinger <jreidin...@suse.com> + +- Fix return code of CLI "show" command (bsc#1143193) +- 4.2.4 + +------------------------------------------------------------------- Old: ---- yast2-ftp-server-4.2.3.tar.bz2 New: ---- yast2-ftp-server-4.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.m2j8D2/_old 2020-01-24 14:10:30.530396175 +0100 +++ /var/tmp/diff_new_pack.m2j8D2/_new 2020-01-24 14:10:30.534396176 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-ftp-server # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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 @@ 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 ++++++ yast2-ftp-server-4.2.3.tar.bz2 -> yast2-ftp-server-4.2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-4.2.3/package/yast2-ftp-server.changes new/yast2-ftp-server-4.2.4/package/yast2-ftp-server.changes --- old/yast2-ftp-server-4.2.3/package/yast2-ftp-server.changes 2019-12-30 17:22:43.000000000 +0100 +++ new/yast2-ftp-server-4.2.4/package/yast2-ftp-server.changes 2020-01-23 11:19:27.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 23 09:02:55 UTC 2020 - Josef Reidinger <jreidin...@suse.com> + +- Fix return code of CLI "show" command (bsc#1143193) +- 4.2.4 + +------------------------------------------------------------------- Mon Dec 30 16:11:40 UTC 2019 - Josef Reidinger <jreidin...@suse.com> - fix crash with undefined method mkdir (bsc#1158421) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-4.2.3/package/yast2-ftp-server.spec new/yast2-ftp-server-4.2.4/package/yast2-ftp-server.spec --- old/yast2-ftp-server-4.2.3/package/yast2-ftp-server.spec 2019-12-30 17:22:43.000000000 +0100 +++ new/yast2-ftp-server-4.2.4/package/yast2-ftp-server.spec 2020-01-23 11:19:27.000000000 +0100 @@ -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 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-4.2.3/src/lib/y2ftp/clients/ftp_server.rb new/yast2-ftp-server-4.2.4/src/lib/y2ftp/clients/ftp_server.rb --- old/yast2-ftp-server-4.2.3/src/lib/y2ftp/clients/ftp_server.rb 2019-12-30 17:22:43.000000000 +0100 +++ new/yast2-ftp-server-4.2.4/src/lib/y2ftp/clients/ftp_server.rb 2020-01-23 11:19:27.000000000 +0100 @@ -55,10 +55,11 @@ "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 @@ end CommandLine.Print("") - false + true end def FTPdCMDStartup(options) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-4.2.3/test/spec_helper.rb new/yast2-ftp-server-4.2.4/test/spec_helper.rb --- old/yast2-ftp-server-4.2.3/test/spec_helper.rb 2019-12-30 17:22:43.000000000 +0100 +++ new/yast2-ftp-server-4.2.4/test/spec_helper.rb 2020-01-23 11:19:27.000000000 +0100 @@ -20,6 +20,10 @@ SRC_PATH = File.expand_path("../src", __dir__) ENV["Y2DIR"] = SRC_PATH +# localization agnostic tests +ENV["LC_ALL"] = "en_US.utf-8" +ENV["LANG"] = "en_US.utf-8" + require "yast" # stub module to prevent its Import diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-4.2.3/test/y2ftp/clients/ftp_server_test.rb new/yast2-ftp-server-4.2.4/test/y2ftp/clients/ftp_server_test.rb --- old/yast2-ftp-server-4.2.3/test/y2ftp/clients/ftp_server_test.rb 2019-12-30 17:22:43.000000000 +0100 +++ new/yast2-ftp-server-4.2.4/test/y2ftp/clients/ftp_server_test.rb 2020-01-23 11:19:27.000000000 +0100 @@ -26,6 +26,8 @@ subject { described_class.new } describe "#FTPdCMDShow" do + let(:anon_authen) { "0" } + before do allow(Yast::FtpServer).to receive(:EDIT_SETTINGS).and_return("AnonAuthen" => anon_authen) @@ -71,5 +73,9 @@ subject.FTPdCMDShow({}) end end + + it "returns true" do + expect(subject.FTPdCMDShow({})).to eq true + end end end