Author: aschnell Date: Tue Oct 6 12:27:39 2009 New Revision: 58951 URL: http://svn.opensuse.org/viewcvs/yast?rev=58951&view=rev Log: - moved AddWinInfo() to StorageProposal Modified: trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.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 Tue Oct 6 12:27:39 2009 @@ -931,34 +931,6 @@ } -/** - * Adds ... and returns the changed map - * - * @param map <string,map> targets - * @return map <string,map> targets - */ -global define map<string,map> AddWinInfo( map<string,map> targets ) - ``{ - y2milestone( "AddWinInfo called" ); - foreach(string disk, map data, targets, - ``{ - targets[disk,"partitions"] = - maplist(map p, data["partitions"]:[], - ``{ - if( Partitions::IsDosWinNtPartition(p["fsid"]:0) && - contains( [ `ntfs, `vfat ], p["used_fs"]:`none )) - { - p["winfo"] = GetFreeSpace( p["device"]:"", 0, - p["used_fs"]:`none, false ); - y2milestone( "AddWinInfo %1", p ); - } - return( p ); - }); - }); - return( targets ); - }; - - global string SaveDumpPath(string name) { string ret = Directory::tmpdir + "/" + name; @@ -2999,6 +2971,7 @@ }); }; + global define void AddMountPointsForWin( map<string,map> targets ) ``{ y2milestone( "AddMountPointsForWin called" ); @@ -3020,6 +2993,7 @@ }); } + /** * Removes ... maps to ... * Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stora... ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Tue Oct 6 12:27:39 2009 @@ -318,6 +318,26 @@ } + map<string, map> AddWinInfo(map<string, map> targets) + { + y2milestone("AddWinInfo called"); + foreach(string disk, map data, targets, { + targets[disk, "partitions"] = + maplist(map p, data["partitions"]:[], { + if (Partitions::IsDosWinNtPartition(p["fsid"]:0) && + contains([ `ntfs, `vfat ], p["used_fs"]:`none)) + { + p["winfo"] = Storage::GetFreeSpace(p["device"]:"", 0, + p["used_fs"]:`none, false); + y2milestone("AddWinInfo %1", p); + } + return p; + }); + }); + return targets; + } + + map<string, boolean> swapable = $[]; @@ -2917,7 +2937,7 @@ y2milestone( "get_inst_proposal start" ); flex_init_swapable( target ); map<string, any> ret = $[]; - target = Storage::AddWinInfo(target); + target = AddWinInfo(target); ret["target"] = target; map root = $[ "mount" : "/", "increasable" : true, "fsys" : Partitions::DefaultFs(), "size" : 0 ]; @@ -3662,7 +3682,7 @@ target = remove_mount_points(target); if( size(vg_key)==0 ) target = remove_vm(target,key); - target = Storage::AddWinInfo(target); + target = AddWinInfo(target); ret["target"] = target; map boot = $[ "mount" : Partitions::BootMount(), "size" : Partitions::MinimalNeededBootsize(), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org