Author: jsuchome Date: Wed Mar 23 15:00:08 2011 New Revision: 63652 URL: http://svn.opensuse.org/viewcvs/yast?rev=63652&view=rev Log: - aborting in Stage::cont does not abort installation (bnc#678650) - 2.21.0 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/routines.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=63652&r1=63651&r2=63652&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Wed Mar 23 15:00:08 2011 @@ -1 +1 @@ -2.20.2 +2.21.0 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba-client.changes?rev=63652&r1=63651&r2=63652&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Wed Mar 23 15:00:08 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 23 12:40:12 CET 2011 - jsuchome@suse.cz + +- aborting in Stage::cont does not abort installation (bnc#678650) +- 2.21.0 + +------------------------------------------------------------------- Wed Jan 5 15:59:27 CET 2011 - jsuchome@suse.cz - import all config file sections, not only [global] Modified: trunk/samba-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/routines.ycp?rev=63652&r1=63651&r2=63652&view=diff ============================================================================== --- trunk/samba-client/src/routines.ycp (original) +++ trunk/samba-client/src/routines.ycp Wed Mar 23 15:00:08 2011 @@ -132,9 +132,7 @@ * @return true if abort is confirmed */ define boolean ReallyAbort() ``{ - return (Stage::cont() && !contains (WFM::Args (), "from_users")) ? - Popup::ConfirmAbort (`incomplete) : - (!Samba::GetModified() || Popup::ReallyAbort(true)); + return (Samba::GetModified () || Stage::cont ()) ? Popup::ReallyAbort (true) : true; } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org