Author: jsrain Date: Tue Feb 15 10:53:21 2011 New Revision: 63412 URL: http://svn.opensuse.org/viewcvs/yast?rev=63412&view=rev Log: added time-out when asking about formatting a disk during AutoInstallation (bnc#668317) Modified: branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp Modified: branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/p... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes Tue Feb 15 10:53:21 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 15 10:47:15 CET 2011 - jsrain@suse.cz + +- added time-out when asking about formatting a disk during + AutoInstallation (bnc#668317) + +------------------------------------------------------------------- Thu Mar 4 09:30:58 CET 2010 - mzugec@suse.cz - error message more detailed (bnc#525447) Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/s... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/DASDController.ycp Tue Feb 15 10:53:21 2011 @@ -447,7 +447,10 @@ integer ret = (integer)SCR::Execute (.target.bash, command); y2milestone ("Running command %1 with exit code %2", command, ret); if (ret == 8){ - if (Popup::ContinueCancel (sformat (_("Device %1 is unformatted. Format device now?\nIf you want to format multiple devices in parallel,\npress Cancel and select 'Perform Action', 'Format' later on!"), channel))){ + string popup = sformat (_("Device %1 is unformatted. Format device now?\nIf you want to format multiple devices in parallel,\npress Cancel and select 'Perform Action', 'Format' later on!"), channel); + if ((Mode::autoinst() && Popup::TimedOKCancel(popup, 10)) + || Popup::ContinueCancel (popup)) + { string cmd = sformat("ls /sys/bus/ccw/devices/%1/block/|tr -d '\n'", channel); map<string, any> disk = (map<string, any>)SCR::Execute(.target.bash_output, cmd); if (disk["exit"]:-1 == 0 && size(disk["stdout"]:"")>0){ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org