Author: aschnell
Date: Fri May 16 21:32:17 2008
New Revision: 47640
URL: http://svn.opensuse.org/viewcvs/yast?rev=47640&view=rev
Log:
- reverted (this is much more difficult)
Modified:
branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp
Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp?rev=47640&r1=47639&r2=47640&view=diff
==============================================================================
--- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original)
+++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Fri May 16 21:32:17 2008
@@ -41,20 +41,10 @@
`CT_LVM : 4, `CT_EVMS : 5, `CT_DM : 6, `CT_NFS : 7 ];
list<string> keys = maplist(string dev, map disk, target_map, { return dev; });
-
keys = sort(string a, string b, keys, {
-
integer oa = disk_order[target_map[a,"type"]:`CT_UNKNOWN]:8;
integer ob = disk_order[target_map[b,"type"]:`CT_UNKNOWN]:8;
- if (oa != ob)
- return oa < ob;
-
- integer la = size(a);
- integer lb = size(b);
- if (la != lb)
- return la < lb;
-
- return a < b;
+ return (oa==ob) ? (a