Author: aschnell Date: Thu Dec 10 11:25:49 2009 New Revision: 60036 URL: http://svn.opensuse.org/viewcvs/yast?rev=60036&view=rev Log: - fixes for proposal testsuite Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stora... ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Dec 10 11:25:49 2009 @@ -793,18 +793,8 @@ * @param symbol used_fs * @param boolean verbose */ -global define map GetFreeSpace( string device, integer testsize, - symbol used_fs, boolean verbose ) - ``{ - if( Mode::test() ) - { - integer wf = tointeger(tofloat(testsize) * 0.6); - integer wu = tointeger(tofloat(testsize) * 0.4); - integer ls = tointeger(tofloat(testsize) * 0.5); - return( $[ "free" : wf, "used" : wu, - "linux_size" : ls, "new_size": (wu + wf - ls) ] ); - } - +global map GetFreeSpace(string device, integer testsize, symbol used_fs, boolean verbose) +{ integer used = 0; integer resize_free = 0; integer df_free = 0; @@ -905,8 +895,8 @@ "new_size":new_size ]; ret["ok"] = r; y2milestone( "GetFreeSpace %1 ret %2", device, ret ); - return( ret ); - }; + return ret; +} global integer GetUnusedPartitionSlots(string device, list<map> &slots) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org