Author: jsrain Date: Tue Feb 15 11:24:17 2011 New Revision: 63414 URL: http://svn.opensuse.org/viewcvs/yast?rev=63414&view=rev Log: fixed command line interface - not polling UI while reading the settings (bnc#660821) Modified: trunk/ftp-server/VERSION trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/FtpServer.ycp trunk/ftp-server/src/ftp-server.ycp Modified: trunk/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/VERSION?rev=63414&r1=63413&r2=63414&view=diff ============================================================================== --- trunk/ftp-server/VERSION (original) +++ trunk/ftp-server/VERSION Tue Feb 15 11:24:17 2011 @@ -1 +1 @@ -2.19.0 +2.20.0 Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-server.changes?rev=63414&r1=63413&r2=63414&view=diff ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Tue Feb 15 11:24:17 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 15 11:18:37 CET 2011 - jsrain@suse.cz + +- fixed command line interface - not polling UI while reading the + settings (bnc#660821) +- 2.20.0 + +------------------------------------------------------------------- Thu Nov 18 09:30:14 CEST 2010 - jsrain@suse.cz - remove listen_ipv6 from vsftp.conf - it was preventing from Modified: trunk/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/FtpServer.ycp?rev=63414&r1=63413&r2=63414&view=diff ============================================================================== --- trunk/ftp-server/src/FtpServer.ycp (original) +++ trunk/ftp-server/src/FtpServer.ycp Tue Feb 15 11:24:17 2011 @@ -851,6 +851,8 @@ * @return boolean true if abort confirmed */ global boolean PollAbort() { + if (Mode::commandline()) + return false; if (UI::PollInput() == `abort) return Abort(); Modified: trunk/ftp-server/src/ftp-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/ftp-server.ycp?rev=63414&r1=63413&r2=63414&view=diff ============================================================================== --- trunk/ftp-server/src/ftp-server.ycp (original) +++ trunk/ftp-server/src/ftp-server.ycp Tue Feb 15 11:24:17 2011 @@ -252,6 +252,7 @@ CommandLine::Print(""); + return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org