Author: jsuchome Date: Wed Mar 23 12:35:11 2011 New Revision: 63648 URL: http://svn.opensuse.org/viewcvs/yast?rev=63648&view=rev Log: - aborting in Stage::cont does not abort installation (bnc#678650) - 2.21.1 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/dialogs.ycp Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=63648&r1=63647&r2=63648&view=diff ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Wed Mar 23 12:35:11 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-kerberos-client.changes?rev=63648&r1=63647&r2=63648&view=diff ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Wed Mar 23 12:35:11 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 23 12:14:24 CET 2011 - jsuchome@suse.cz + +- aborting in Stage::cont does not abort installation (bnc#678650) +- 2.21.1 + +------------------------------------------------------------------- Wed Mar 16 14:51:12 CET 2011 - jsuchome@suse.cz - show an info that sssd is configured (fate#308902) Modified: trunk/kerberos-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/dialogs.ycp?rev=63648&r1=63647&r2=63648&view=diff ============================================================================== --- trunk/kerberos-client/src/dialogs.ycp (original) +++ trunk/kerberos-client/src/dialogs.ycp Wed Mar 23 12:35:11 2011 @@ -164,15 +164,7 @@ */ define symbol ReallyAbort () { - boolean ret = true; - if (!Stage::cont () || contains (WFM::Args (), "from_users")) - { - ret = Kerberos::Modified() ? Popup::ReallyAbort (true) : true; - } - else - { - ret = Popup::ConfirmAbort (`incomplete); - } + boolean ret = (Kerberos::Modified() || Stage::cont ()) ? Popup::ReallyAbort (true) : true; if ( ret ) return `abort; else return `back; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org