Mailinglist Archive: yast-commit (195 mails)

< Previous Next >
[yast-commit] r63643 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/ui.ycp
Author: jsuchome
Date: Wed Mar 23 12:15:28 2011
New Revision: 63643

URL: http://svn.opensuse.org/viewcvs/yast?rev=63643&view=rev
Log:
- aborting in Stage::cont does not abort installation (bnc#678650)
- 2.21.4


Modified:
trunk/ldap-client/VERSION
trunk/ldap-client/package/yast2-ldap-client.changes
trunk/ldap-client/src/ui.ycp

Modified: trunk/ldap-client/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63643&r1=63642&r2=63643&view=diff
==============================================================================
--- trunk/ldap-client/VERSION (original)
+++ trunk/ldap-client/VERSION Wed Mar 23 12:15:28 2011
@@ -1 +1 @@
-2.21.3
+2.21.4

Modified: trunk/ldap-client/package/yast2-ldap-client.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-client.changes?rev=63643&r1=63642&r2=63643&view=diff
==============================================================================
--- trunk/ldap-client/package/yast2-ldap-client.changes (original)
+++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Mar 23 12:15:28 2011
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Mar 23 12:13:16 CET 2011 - jsuchome@xxxxxxx
+
+- aborting in Stage::cont does not abort installation (bnc#678650)
+- 2.21.4
+
+-------------------------------------------------------------------
Wed Mar 23 08:45:31 CET 2011 - jsuchome@xxxxxxx

- remove 'ldap' from nsswitch.conf when sssd is configured

Modified: trunk/ldap-client/src/ui.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=63643&r1=63642&r2=63643&view=diff
==============================================================================
--- trunk/ldap-client/src/ui.ycp (original)
+++ trunk/ldap-client/src/ui.ycp Wed Mar 23 12:15:28 2011
@@ -44,15 +44,7 @@
*/
define symbol ReallyAbort () ``{

- boolean ret = true;
- if (!Stage::cont () || contains (WFM::Args (), "from_users"))
- {
- ret = Modified() ? Popup::ReallyAbort (true) : true;
- }
- else
- {
- ret = Popup::ConfirmAbort (`incomplete);
- }
+ boolean ret = (Modified() || Stage::cont ()) ? Popup::ReallyAbort
(true) : true;

if ( ret ) return `abort;
else return `back;

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages