Author: ug Date: Tue Jun 24 10:39:33 2008 New Revision: 48494 URL: http://svn.opensuse.org/viewcvs/yast?rev=48494&view=rev Log: passwords mismatch' check in 'ask' fixed (bnc#401208) Modified: branches/SuSE-SLE-10-SP3-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/dialogs/ask.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/autoins... ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/autoinstallation/package/autoyast2.changes Tue Jun 24 10:39:33 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jun 24 10:38:27 CEST 2008 - ug@suse.de + +- passwords mismatch' check in 'ask' fixed (bnc#401208) + +------------------------------------------------------------------- Thu Mar 27 11:11:14 CET 2008 - ug@suse.de - XML profile on USB devices can make yast to hang when the profile Modified: branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/autoins... ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/dialogs/ask.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/dialogs/ask.ycp Tue Jun 24 10:39:33 2008 @@ -139,6 +139,7 @@ while (true) { any ret = UI::UserInput(); if( ret == `ok ) { + integer runAgain = 0; integer element_cnt = 0; foreach( map ask, (list<map>)dialogs[dialog_nr]:[], ``{ list<string> position = splitstring( ask["path"]:"", "," ); @@ -153,7 +154,7 @@ string pass2 = (string)UI::QueryWidget(`id(`pass2), `Value); if( pass2 != (string)val ) { Popup::Error("The two passwords mismatch."); - continue; + runAgain = 1; } } y2milestone("question=%1 was answered with val=%2",ask["question"]:"", val); @@ -173,7 +174,8 @@ y2milestone("writing answer to %1 failed",file); } }); - break; + if( runAgain == 0 ) + break; } } UI::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org