Author: fehr Date: Mon Aug 9 13:49:48 2010 New Revision: 62372 URL: http://svn.opensuse.org/viewcvs/yast?rev=62372&view=rev Log: make mkfs option "dir_index" work as expected again Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=62372&r1=62371&r2=62372&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 9 13:49:48 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 9 13:38:45 CEST 2010 - fehr@suse.de + +- make mkfs option "dir_index" work as expected again + +------------------------------------------------------------------- Fri Aug 06 15:48:27 CEST 2010 - aschnell@suse.de - hide button "Create New Partition Table" for DASDs Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=62372&r1=62371&r2=62372&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Mon Aug 9 13:49:48 2010 @@ -370,6 +370,11 @@ $[ "option_str" : entry[`option_str]:"", "option_cmd" : entry[`option_cmd]:`mkfs, "option_value" : query ]; + if( is( query, boolean ) && query==false && + haskey( entry, `option_false ) ) + { + fs_option["option_str"] = entry[`option_false]:""; + } y2milestone( "FileSystemOptions fs_option %1", fs_option ); if( entry[`option_blank]:false ) Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=62372&r1=62371&r2=62372&view=diff ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Aug 9 13:49:48 2010 @@ -588,8 +588,8 @@ `widget : `CheckBox(`id("opt_dir_index"), `opt(`hstretch), _("&Directory Index Feature")), `query_key : "opt_dir_index", `option_str : "-O dir_index", + `option_false : "-O ^dir_index", `type : `boolean, - `default : false, // help text, richtext format `help_text : _("<p><b>Directory Index:</b> Enables use of hashed b-trees to speed up lookups in large directories.</p>\n") Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=62372&r1=62371&r2=62372&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Aug 9 13:49:48 2010 @@ -1071,7 +1071,7 @@ } else if( is(option_value, boolean) && option_value != nil ) { - if( (boolean) option_value ) + if( size(option_str)>0 ) { if( size(ret)>0 ) ret = ret + " "; @@ -1113,17 +1113,30 @@ ``{ map m = $[]; string os = o[`option_str]:""; - if( !found && size(os)>0 && search( opts, os )==0 ) + string nos = o[`option_false]:""; + boolean se_ok = false; + boolean found_os = false; + if( size(os)>0 && search( opts, os )==0 ) + { + found_os = true; + se_ok = true; + } + else if( size(nos)>0 && search( opts, nos )==0) + { + found_os = false; + se_ok = true; + } + if( !found && se_ok ) { found = true; - m["option_str"] = os; + m["option_str"] = found_os?os:nos; m["option_cmd"] = o[`option_cmd]:`mkfs; if( o[`type]:`text==`boolean ) { - m["option_value"] = true; + m["option_value"] = found_os; ret[o[`query_key]:""] = m; } - opts = substring( opts, size(os) ); + opts = substring( opts, found_os?size(os):size(nos) ); pos = findfirstnotof( opts, " \t" ); if( pos>0 ) opts = substring( opts, pos ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org