Author: aschnell Date: Tue Jan 12 12:52:48 2010 New Revision: 60329 URL: http://svn.opensuse.org/viewcvs/yast?rev=60329&view=rev Log: - avoid two error popups concerning swap in sequence (bnc #387242) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=60329&r1=60328&r2=60329&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Jan 12 12:52:48 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 12 12:51:14 CET 2010 - aschnell@suse.de + +- avoid two error popups concerning swap in sequence (bnc #387242) + +------------------------------------------------------------------- Mon Jan 11 18:55:11 CET 2010 - fehr@suse.de - do not propose root partitions smaller than 512MB even in Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_lib.ycp?rev=60329&r1=60328&r2=60329&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Tue Jan 12 12:52:48 2010 @@ -414,17 +414,7 @@ } else if( !part["format"]:false && part["detected_fs"]:`none != `swap ) { - // error popup text -string message = _(" -WARNING: - -You chose a swap partition but did not direct YaST2 to format it. -This swap partition will probably not be usable. - -Change the setup? -"); - - allowed = !Popup::YesNo(message); + allowed = false; } if( allowed ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org