Author: aschnell Date: Fri Jan 8 15:52:24 2010 New Revision: 60294 URL: http://svn.opensuse.org/viewcvs/yast?rev=60294&view=rev Log: - use GetFreeInfo instead of GetFreeSpace in IsEfiPartition - removed unused parameter from GetFreeSpace Modified: trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dialogs.ycp?rev=60294&r1=60293&r2=60294&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Fri Jan 8 15:52:24 2010 @@ -591,7 +591,7 @@ { if (used_fs != `swap) { - map free_data = Storage::GetFreeSpace(device, 0, used_fs, true); + map free_data = Storage::GetFreeSpace(device, used_fs, true); if (size(free_data) == 0 || !free_data["ok"]:false) { y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none); Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=60294&r1=60293&r2=60294&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Fri Jan 8 15:52:24 2010 @@ -845,7 +845,7 @@ * @param symbol used_fs * @param boolean verbose */ -global map GetFreeSpace(string device, integer testsize, symbol used_fs, boolean verbose) +global map GetFreeSpace(string device, symbol used_fs, boolean verbose) { map resize_info = $[]; map content_info = $[]; @@ -2978,14 +2978,24 @@ return( ret ); } -define boolean IsEfiPartition( map p ) + +boolean IsEfiPartition(map p) { - map m = GetFreeSpace( p["device"]:"", 0, p["used_fs"]:`none, false ); - boolean ret = m["efi"]:false; - y2milestone( "IsEfiPartition ret:%1", ret ); - return( ret ); + boolean ret = false; + + map resize_info = $[]; + map content_info = $[]; + if (GetFreeInfo(p["device"]:"", false, resize_info, true, content_info, true) && + content_info[`efi]:false) + { + ret = true; } + y2milestone("IsEfiPartition ret:%1", ret); + return ret; + } + + /** * Search in the list partitions for windows partitions and add the key * "mount" to the found windows partitions. Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageProposal.ycp?rev=60294&r1=60293&r2=60294&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Fri Jan 8 15:52:24 2010 @@ -329,7 +329,7 @@ if (Partitions::IsDosWinNtPartition(p["fsid"]:0) && contains([ `ntfs, `vfat ], p["used_fs"]:`none)) { - p["winfo"] = Storage::GetFreeSpace(p["device"]:"", 0, + p["winfo"] = Storage::GetFreeSpace(p["device"]:"", p["used_fs"]:`none, false); y2milestone("AddWinInfo %1", p); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org