March 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r45154 - in /branches/SuSE-SLE-10-SP2-Branch/installation: VERSION package/yast2-installation.changes src/clients/umount_finish.ycp
by locilka＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: locilka Date: Mon Mar 3 13:30:29 2008 New Revision: 45154 URL: http://svn.opensuse.org/viewcvs/yast?rev=45154&view=rev Log: - Umount mounted file-systems -l -f (lazy umount) at the end of the first stage installation (bnc #366544). - 2.13.206 Modified: branches/SuSE-SLE-10-SP2-Branch/installation/VERSION branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/umount_finish.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/VERSION Mon Mar 3 13:30:29 2008 @@ -1 +1 @@ -2.13.205 +2.13.206 Modified: branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes Mon Mar 3 13:30:29 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 3 13:28:56 CET 2008 - locilka(a)suse.cz + +- Umount mounted file-systems -l -f (lazy umount) at the end of the + first stage installation (bnc #366544). +- 2.13.206 + +------------------------------------------------------------------- Tue Feb 26 17:08:19 CET 2008 - locilka(a)suse.cz - Catching an exception when calling the inst_repair fails and Modified: branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/umount_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/umount_finish.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/umount_finish.ycp Mon Mar 3 13:30:29 2008 @@ -20,6 +20,7 @@ import "Storage"; import "Hotplug"; import "Vendor"; +import "String"; any ret = nil; string func = ""; @@ -113,7 +114,7 @@ umountLength = umountLength - 1; string tmp = Installation::destdir + (string) (umountList[umountLength]:""); y2milestone("umount target: %1", tmp); - WFM::Execute(.local.umount, tmp); + WFM::Execute (.target.bash, sformat ("umount -l -f '%1'", String::Quote (tmp))); } // must call .local.bash_output ! -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45153 - /tags/branch-SLE-10-SP2-2_13_22/sound/
by lslezak＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: lslezak Date: Mon Mar 3 12:55:36 2008 New Revision: 45153 URL: http://svn.opensuse.org/viewcvs/yast?rev=45153&view=rev Log: Created tag branch-SLE-10-SP2-2_13_22 for sound Added: tags/branch-SLE-10-SP2-2_13_22/sound/ - copied from r45152, branches/SuSE-SLE-10-SP2-Branch/sound/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45152 - in /branches/SuSE-SLE-10-SP2-Branch/sound: VERSION data/addons/card_addons.ycp data/sndcards.ycp package/yast2-sound.changes
by lslezak＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: lslezak Date: Mon Mar 3 12:51:32 2008 New Revision: 45152 URL: http://svn.opensuse.org/viewcvs/yast?rev=45152&view=rev Log: - added ICH9 and ICH10 audio to the database (#365079) - updated the sound card database (added new PCI IDs) (#365931) - 2.13.22 Modified: branches/SuSE-SLE-10-SP2-Branch/sound/VERSION branches/SuSE-SLE-10-SP2-Branch/sound/data/addons/card_addons.ycp branches/SuSE-SLE-10-SP2-Branch/sound/data/sndcards.ycp branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes Modified: branches/SuSE-SLE-10-SP2-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/VERSION Mon Mar 3 12:51:32 2008 @@ -1 +1 @@ -2.13.21 +2.13.22 Modified: branches/SuSE-SLE-10-SP2-Branch/sound/data/addons/card_addons.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/data/addons/card_addons.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/data/addons/card_addons.ycp Mon Mar 3 12:51:32 2008 @@ -165,6 +165,8 @@ ["snd-hda-intel", "ICH7 (HDA), Intel"], ["snd-hda-intel", "ESB2 (HDA), Intel"], ["snd-hda-intel", "ICH8 (HDA), Intel"], + ["snd-hda-intel", "ICH9 (HDA), Intel"], + ["snd-hda-intel", "ICH10 (HDA), Intel"], ["snd-hda-intel", "SB450, ATI"], ["snd-hda-intel", "VT8251, VIA"], ["snd-hda-intel", "M5461, ULI"], Modified: branches/SuSE-SLE-10-SP2-Branch/sound/data/sndcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/data/sndcards.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/data/sndcards.ycp Mon Mar 3 12:51:32 2008 @@ -1,4 +1,4 @@ -/* this file is automatically generated for kernel version 2.6.16.37-3-default*/ +/* this file is automatically generated for kernel version 2.6.16.60-0.4-default*/ { textdomain "sound_db"; @@ -513,6 +513,8 @@ "ICH7 (HDA), Intel", "ESB2 (HDA), Intel", "ICH8 (HDA), Intel", + "ICH9 (HDA), Intel", + "ICH10 (HDA), Intel", "SB450, ATI", "VT8251, VIA", "M5461, ULI", @@ -659,7 +661,18 @@ 17275 : 78, 17283 : 78, 31001 : 78, - 31035 : 78 + 31035 : 78, + 38415 : 78, + 43520 : 78, + 43528 : 78, + 43536 : 78, + 43544 : 78, + 43552 : 78, + 43560 : 78, + 43568 : 78, + 43576 : 78, + 43584 : 78, + 43592 : 78 ], 4107 : $[ 46 : 81 @@ -738,7 +751,17 @@ 1098 : 78, 1099 : 78, 1372 : 78, - 1373 : 78 + 1373 : 78, + 1908 : 78, + 1909 : 78, + 1910 : 78, + 1911 : 78, + 2044 : 78, + 2045 : 78, + 2752 : 78, + 2753 : 78, + 2754 : 78, + 2755 : 78 ], 4334 : $[ 16320 : 54, @@ -896,6 +919,8 @@ 10315 : 78, 10558 : 78, 10559 : 78, + 14910 : 78, + 14958 : 78, 29077 : 38, 29078 : 39 ], @@ -4015,6 +4040,8 @@ "ICH7 (HDA)", "ESB2 (HDA)", "ICH8 (HDA)", + "ICH9 (HDA)", + "ICH10 (HDA)", "6300ESB", "82801AA-ICH", "82801BA-ICH2", Modified: branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes Mon Mar 3 12:51:32 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 3 12:36:38 CET 2008 - lslezak(a)suse.cz + +- added ICH9 and ICH10 audio to the database (#365079) +- updated the sound card database (added new PCI IDs) (#365931) +- 2.13.22 + +------------------------------------------------------------------- Thu Feb 21 15:55:40 CET 2008 - lslezak(a)suse.cz - merged proofread texts (proofed-sle10-sp2-2008-02-12) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45151 - in /branches/tmp/aschnell/part-redesign/storage/src: include/ep-all.ycp include/ep-hd.ycp include/ep-lvm.ycp include/ep-raid.ycp modules/StorageFields.ycp
by aschnell＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: aschnell Date: Mon Mar 3 12:42:52 2008 New Revision: 45151 URL: http://svn.opensuse.org/viewcvs/yast?rev=45151&view=rev Log: - simplifications Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp Mon Mar 3 12:42:52 2008 @@ -49,7 +49,7 @@ term header = StorageFields::TableHeader(fields); map<string, map> tg = Storage::GetTargetMap(); - list table_list = StorageFields::TableContent(tg, fields, predicate_all); + list table_list = StorageFields::TableContent(fields, tg, predicate_all); UI::ReplaceWidget(`tree_panel, `VBox( @@ -81,7 +81,7 @@ filter_ = UI::QueryWidget(`filter, `Value); map<string, map> tg = Storage::GetTargetMap(); - list table_list = StorageFields::TableContent(tg, fields, predicate_all); + list table_list = StorageFields::TableContent(fields, tg, predicate_all); UI::ChangeWidget(`table, `Items, table_list); } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Mon Mar 3 12:42:52 2008 @@ -43,7 +43,6 @@ string device = (string) user_data; map<string, map> tg = Storage::GetTargetMap(); - map disk = tg[device]:$[]; list<symbol> fields = StorageFields::Filter([ `device, `vendor, `model, `size, `newline, `bus, `udev_path, `udev_id, @@ -52,7 +51,7 @@ UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - StorageFields::Overview(disk, nil, fields), + StorageFields::Overview(fields, tg, device), `VStretch(), `HBox( `PushButton(`id(`smart), "Smart..." ), @@ -99,7 +98,7 @@ term header = StorageFields::TableHeader(fields); map<string, map> tg = Storage::GetTargetMap(); - list table_list = StorageFields::TableContent(tg, fields, predicate); + list table_list = StorageFields::TableContent(fields, tg, predicate); UI::ReplaceWidget(`tab_panel, `VBox( @@ -186,8 +185,6 @@ { string device = (string) user_data; map<string, map> tg = Storage::GetTargetMap(); - map disk = Storage::GetDisk(tg, device); - map partition = Storage::GetPartition(tg, device); list<symbol> fields = StorageFields::Filter([ `device, `mount_point, `mount_by, `size, `fs_type, `newline, `uuid, `label, `udev_path, @@ -198,7 +195,7 @@ `VBox( `HStretch(), `Left(`Heading("Partition: " + device)), - StorageFields::Overview(disk, partition, fields), + StorageFields::Overview(fields, tg, device), `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Mon Mar 3 12:42:52 2008 @@ -53,14 +53,13 @@ string device = (string) user_data; map<string, map> tg = Storage::GetTargetMap(); - map disk = tg[device]:$[]; list<symbol> fields = StorageFields::Filter([ `size, `pe_size, `lvm_metadata ]); UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - StorageFields::Overview(disk, nil, fields), + StorageFields::Overview(fields, tg, device), `VStretch(), `HBox( `PushButton(`id(`delete), "Delete..."), @@ -113,7 +112,7 @@ term header = StorageFields::TableHeader(fields); map<string, map> tg = Storage::GetTargetMap(); - list table_list = StorageFields::TableContent(tg, fields, predicate); + list table_list = StorageFields::TableContent(fields, tg, predicate); UI::ReplaceWidget(`tab_panel, `VBox( @@ -161,7 +160,6 @@ string device = (string) user_data; map<string, map> tg = Storage::GetTargetMap(); - map disk = tg[device]:$[]; symbol predicate(map disk, map partition) { @@ -182,7 +180,7 @@ `used_by ]); term header = StorageFields::TableHeader(fields); - list table_list = StorageFields::TableContent(tg, fields, predicate); + list table_list = StorageFields::TableContent(fields, tg, predicate); UI::ReplaceWidget(`tab_panel, `VBox( @@ -234,8 +232,6 @@ { string device = (string) user_data; map<string, map> tg = Storage::GetTargetMap(); - map disk = Storage::GetDisk(tg, device); - map partition = Storage::GetPartition(tg, device); list<symbol> fields = StorageFields::Filter([ `mount_point, `mount_by, `size, `stripes, `fs_type, `uuid, `label ]); @@ -244,7 +240,7 @@ `VBox( `HStretch(), `Left(`Heading("Logical Volume: " + device)), - StorageFields::Overview(disk, partition, fields), + StorageFields::Overview(fields, tg, device), `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp Mon Mar 3 12:42:52 2008 @@ -39,15 +39,13 @@ string part_device = (string) user_data; map<string, map> tg = Storage::GetTargetMap(); - map disk = Storage::GetDisk(tg, part_device); - map partition = Storage::GetPartition(tg, part_device); list<symbol> fields = StorageFields::Filter([ `mount_point, `size, `raid_type ]); UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - StorageFields::Overview(disk, partition, fields), + StorageFields::Overview(fields, tg, part_device), `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), @@ -96,7 +94,7 @@ term header = StorageFields::TableHeader(fields); map<string, map> tg = Storage::GetTargetMap(); - list table_list = StorageFields::TableContent(tg, fields, predicate); + list table_list = StorageFields::TableContent(fields, tg, predicate); UI::ReplaceWidget(`tab_panel, `VBox( Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Mon Mar 3 12:42:52 2008 @@ -40,24 +40,22 @@ /** - * Sorted call of disk_cb for every disk. + * Call callback for every disk of target_map in a well defined sorted order. */ - global void IterateTargetMap(map<string, map> targets, void(map<string, map>, map) disk_cb) + global void IterateTargetMap(map<string, map> target_map, void(map<string, map>, map) callback) { map disk_order = $[ `CT_DMRAID : 0, `CT_DISK : 1, `CT_MD : 2, `CT_LOOP : 3, `CT_LVM : 4, `CT_EVMS : 5, `CT_DM : 6, `CT_NFS : 7 ]; - list<string> keys = maplist(string dev, map disk, targets, { return dev; }); + list<string> keys = maplist(string dev, map disk, target_map, { return dev; }); keys = sort(string a, string b, keys, { - integer oa = disk_order[targets[a,"type"]:`CT_UNKNOWN]:8; - integer ob = disk_order[targets[b,"type"]:`CT_UNKNOWN]:8; + integer oa = disk_order[target_map[a,"type"]:`CT_UNKNOWN]:8; + integer ob = disk_order[target_map[b,"type"]:`CT_UNKNOWN]:8; return (oa==ob) ? (a<b) : (oa<ob); }); - SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_c"), targets); - foreach(string dev, keys, { - map disk = targets[dev]:$[]; - disk_cb(targets, disk); + map disk = target_map[dev]:$[]; + callback(target_map, disk); }); }; @@ -514,7 +512,7 @@ } - term TableRow(map disk, map part, list<symbol> fields) + term TableRow(list<symbol> fields, map disk, map part) { string device = part == nil ? disk["device"]:"" : part["device"]:""; @@ -590,7 +588,7 @@ * Possible return values for predicate: * `show, `follow, `showandfollow, `ignore */ - global list<term> TableContent(map<string, map> target_map, list<symbol> fields, + global list<term> TableContent(list<symbol> fields, map<string, map> target_map, symbol(map, map) predicate) { list<term> content = []; @@ -602,7 +600,7 @@ if (!AlwaysHideDisk(target_map, disk) && contains([`show, `showandfollow], disk_predicate)) { - term row = StorageFields::TableRow(disk, nil, fields); + term row = StorageFields::TableRow(fields, disk, nil); content = add(content, row); } @@ -617,7 +615,7 @@ if (!AlwaysHidePartition(target_map, disk, partition) && contains([`show, `showandfollow], part_predicate)) { - term row = StorageFields::TableRow(disk, partition, fields); + term row = StorageFields::TableRow(fields, disk, partition); content = add(content, row); } }); @@ -630,14 +628,21 @@ } - global term Overview(map disk, map part, list<symbol> fields) + global term Overview(list<symbol> fields, map<string, map> target_map, string device) { + map disk = Storage::GetDisk(target_map, device); + map part = Storage::GetPartition(target_map, device); + + if (part == $[]) + part = nil; + string ret = mergestring(maplist(symbol field, fields, { if (field == `newline) return "\n"; else return MakeSubInfo(disk, part, field, `overview); }), ""); + return `RichText(`opt(`plainText), ret); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45150 - /branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: aschnell Date: Mon Mar 3 12:28:42 2008 New Revision: 45150 URL: http://svn.opensuse.org/viewcvs/yast?rev=45150&view=rev Log: - added examples Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp Mon Mar 3 12:28:42 2008 @@ -565,6 +565,12 @@ * * @param string device * @return map DiskPartition + * + * Examples: + * "/dev/sda" -> $[ "disk" : "/dev/sda", "nr" : "" ] + * "/dev/sda2" -> $[ "disk" : "/dev/sda", "nr" : 2 ] + * "/dev/system" -> $[ "disk" : "/dev/system", "nr" : "" ] + * "/dev/system/abuild" -> $[ "disk" : "/dev/system", "nr" : "abuild" ] */ global define map GetDiskPartition( string device ) ``{ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45149 - /trunk/bootloader/MAINTAINER
by sh-sh-sh＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: sh-sh-sh Date: Mon Mar 3 12:14:50 2008 New Revision: 45149 URL: http://svn.opensuse.org/viewcvs/yast?rev=45149&view=rev Log: KEEP THAT STUFF UPDATEDvi MAINTAINER Modified: trunk/bootloader/MAINTAINER Modified: trunk/bootloader/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/MAINTAINER?rev=45149&… ============================================================================== --- trunk/bootloader/MAINTAINER (original) +++ trunk/bootloader/MAINTAINER Mon Mar 3 12:14:50 2008 @@ -1 +1 @@ -Olaf Dabrunz <od(a)suse.de> +Jozef Uhliarik <juhliarik(a)suse.cz> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45148 - /trunk/gtk/src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 02 Mar '08

02 Mar '08

Author: rpmcruz Date: Sun Mar 2 03:37:27 2008 New Revision: 45148 URL: http://svn.opensuse.org/viewcvs/yast?rev=45148&view=rev Log: Show architecture next to version. Modified: trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=4514… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Sun Mar 2 03:37:27 2008 @@ -679,6 +679,7 @@ { Ypp::Package::Version *version = new Ypp::Package::Version(); version->number = object->edition().version(); + version->number += " (" + object->arch().asString() + ")"; #ifdef OLD_ZYPP version->repo = ypp->impl->getRepository (object->repository().info().alias()); #else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45147 - in /branches/tmp/aschnell/part-redesign/storage/src: ./ include/ modules/
by aschnell＠svn.opensuse.org 01 Mar '08

01 Mar '08

Author: aschnell Date: Sat Mar 1 20:13:46 2008 New Revision: 45147 URL: http://svn.opensuse.org/viewcvs/yast?rev=45147&view=rev Log: - restructured table and overview generation Added: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp branches/tmp/aschnell/part-redesign/storage/src/inst_custom_part.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-all.ycp Sat Mar 1 20:13:46 2008 @@ -39,15 +39,17 @@ } - list<symbol> columns = [ `device, `id, `size, `format, `fs, `mount, `mount_by, `cyl, `used_by ]; + list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, + `mount_point, `mount_by, `start_cyl, + `end_cyl, `used_by ]); void CreateAllPanel(any user_data) { - term header = GetTableHeaderNew(columns); + term header = StorageFields::TableHeader(fields); map<string, map> tg = Storage::GetTargetMap(); - list table_list = MakePartitionList(tg, columns, predicate_all); + list table_list = StorageFields::TableContent(tg, fields, predicate_all); UI::ReplaceWidget(`tree_panel, `VBox( @@ -75,14 +77,14 @@ void HandleAllPanel(any user_data, any widget) { if (widget == `filter) - { - filter_ = UI::QueryWidget(`filter, `Value); + { + filter_ = UI::QueryWidget(`filter, `Value); - map<string, map> tg = Storage::GetTargetMap(); - list table_list = MakePartitionList(tg, columns, predicate_all); + map<string, map> tg = Storage::GetTargetMap(); + list table_list = StorageFields::TableContent(tg, fields, predicate_all); - UI::ChangeWidget(`table, `Items, table_list); - } + UI::ChangeWidget(`table, `Items, table_list); + } } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Sat Mar 1 20:13:46 2008 @@ -72,194 +72,6 @@ } - // TODO: somehow use in MakePartitionList - string MakeSubInfo(map disk, map part, symbol what) - { - map data = (part == nil ? disk : part); - - switch (what) - { - case `size: - { - return "Size: " + ByteToHumanStringWithZero(data["size_k"]:0*1024) + "\n"; - } - - case `type: - { - string value = ""; - // TODO: see ep-main.ycp - return value; - } - - case `format: - { - string value = ""; - if (part == nil) { - if (disk["dasdfmt"]:false) - value = value + "X"; - } else { - if (part["enc_type"]:`none != `none) - value = value + "C"; - if (part["format"]:false) - value = value + "F"; - } - return "Format: " + value + "\n"; - } - - case `encrypted: - { - string value = data["enc_type"]:`none != `none ? "Yes" : "No"; - return "Encrypted: " + value; - } - - case `fs_type: - { - return "File System: " + FileSystems::GetName(data["used_fs"]:`unknown, "") + "\n"; - } - - case `mount_point: - { - string value = data["mount"]:""; - if (Mode::normal() && data["inactive"]:false ) - value = value + " *"; - return "Mount Point: " + value + "\n"; - } - - case `mount_by: - { - string value = ""; - if (data["mount"]:"" != "") { - map tmp = $[ `device : "K", `uuid : "U", `label : "L", `id : "I", `path : "P" ]; - symbol mount_by = data["mountby"]:`device; - value = tmp[mount_by]:""; - } - return "Mount By: " + value + "\n"; - } - - case `used_by: - { - return "Used By: " + usedByString(data["used_by_type"]:`UB_NONE, data["used_by"]:"") + "\n"; - } - - case `device: - { - return "Kernel Name: " + data["device"]:"" + "\n"; - } - - case `uuid: - { - return "UUID: " + data["uuid"]:"" + "\n"; - } - - case `label: - { - return "Label: " + data["label"]:"" + "\n"; - } - - case `udev_path: - { - return "Path: " + data["udev_path"]:"" + "\n"; - } - - case `udev_id: - { - string ret = ""; - integer i = 1; - foreach(string id, data["udev_id"]:[], { - ret = ret + "ID " + i + ": " + id + "\n"; - i = i + 1; - }); - return ret; - } - - case `bios_id: - { - return "BIOS ID: " + data["bios_id"]:"" + "\n"; - } - - case `vendor: - { - return "Vendor: " + data["vendor"]:"" + "\n"; - } - - case `model: - { - return "Model: " + data["model"]:"" + "\n"; - } - - case `bus: - { - return "Bus: " + data["bus"]:"" + "\n"; - } - - case `lvm_type: - { - return "Metadata Type: " + (data["lvm2"]:true ? "LVM2" : "LVM1") + "\n"; - } - - case `pe_size: - { - return "Physical Extend Size: " + ByteToHumanStringWithZero(data["pesize"]:0) + "\n"; - } - - case `stripes: - { - integer stripes = data["stripes"]:1; - if (stripes == 1) - return "Stripes: " + stripes + "\n"; - else - return "Stripes: " + stripes + " (4 KB)" + "\n"; // FIXME - } - - case `raid_type: - { - return "RAID Type: " + data["raid_type"]:"" + "\n"; - } - - case `cyl_start: - { - string value = "--"; - if (Storage::IsPartitionable(disk)) { - if (part == nil) - value = sformat("%1", 0); - else - value = sformat("%1", part["region", 0]:0); - } - return "Start Cyl: " + value + "\n"; - } - - case `cyl_end: - { - string value = "--"; - if (Storage::IsPartitionable(disk)) { - if (part == nil) - value = sformat("%1", disk["cyl_count"]:0 - 1); - else - value = sformat("%1", part["region", 0]:0 + part["region", 1]:0 - 1); - } - return "End Cyl: " + value + "\n"; - } - } - - return nil; - } - - - term MakeInfo(map disk, map part, list<symbol> rows) - { - string ret = ""; - - foreach(symbol row, rows, { - if (row == `newline) - ret = ret + "\n"; - else - ret = ret + MakeSubInfo(disk, part, row); - }); - - return `Left(`RichText(`opt(`plainText), ret)); - } - - map<symbol, any> DlgResize(symbol flavour) { integer lv_used = 3500; Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Sat Mar 1 20:13:46 2008 @@ -45,11 +45,14 @@ map<string, map> tg = Storage::GetTargetMap(); map disk = tg[device]:$[]; + list<symbol> fields = StorageFields::Filter([ `device, `vendor, `model, `size, + `newline, `bus, `udev_path, `udev_id, + `start_cyl, `end_cyl ]); + UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - MakeInfo(disk, nil, [ `device, `vendor, `model, `size, `newline, - `bus, `udev_path, `udev_id, `cyl_start, `cyl_end ]), + StorageFields::Overview(disk, nil, fields), `VStretch(), `HBox( `PushButton(`id(`smart), "Smart..." ), @@ -89,12 +92,14 @@ } } - list<symbol> columns = [ `device, `id, `size, `format, `fs, `mount, `mount_by, `cyl, `used_by ]; + list<symbol> fields = StorageFields::Filter([ `device, `bios_id, `size, `format, + `type, `mount_point, `mount_by, + `start_cyl, `end_cyl, `used_by ]); - term header = GetTableHeaderNew(columns); + term header = StorageFields::TableHeader(fields); map<string, map> tg = Storage::GetTargetMap(); - list table_list = MakePartitionList(tg, columns, predicate); + list table_list = StorageFields::TableContent(tg, fields, predicate); UI::ReplaceWidget(`tab_panel, `VBox( @@ -184,13 +189,16 @@ map disk = Storage::GetDisk(tg, device); map partition = Storage::GetPartition(tg, device); + list<symbol> fields = StorageFields::Filter([ `device, `mount_point, `mount_by, `size, + `fs_type, `newline, `uuid, `label, `udev_path, + `udev_id, `used_by, `start_cyl, `end_cyl, + `encrypted ]); + UI::ReplaceWidget(`tree_panel, `VBox( `HStretch(), `Left(`Heading("Partition: " + device)), - MakeInfo(disk, partition, [ `device, `mount_point, `mount_by, `size, `fs_type, `newline, - `uuid, `label, `udev_path, `udev_id, `used_by, `cyl_start, `cyl_end, - `encrypted ]), + StorageFields::Overview(disk, partition, fields), `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Sat Mar 1 20:13:46 2008 @@ -55,10 +55,12 @@ map<string, map> tg = Storage::GetTargetMap(); map disk = tg[device]:$[]; + list<symbol> fields = StorageFields::Filter([ `size, `pe_size, `lvm_metadata ]); + UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - MakeInfo(disk, nil, [ `size, `pe_size, `lvm_type ]), + StorageFields::Overview(disk, nil, fields), `VStretch(), `HBox( `PushButton(`id(`delete), "Delete..."), @@ -104,12 +106,14 @@ } } - list<symbol> columns = [ `device, `size, `format, `fs, `mount, `mount_by, `used_by ]; + list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, + `mount_point, `mount_by, `used_by, + `lvm_metadata, `pe_size, `stripes ]); - term header = GetTableHeaderNew(columns); + term header = StorageFields::TableHeader(fields); map<string, map> tg = Storage::GetTargetMap(); - list table_list = MakePartitionList(tg, columns, predicate); + list table_list = StorageFields::TableContent(tg, fields, predicate); UI::ReplaceWidget(`tab_panel, `VBox( @@ -174,10 +178,11 @@ } } - list<symbol> columns = [ `device, `size, `format, `fs, `used_by ]; + list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, + `used_by ]); - term header = GetTableHeaderNew(columns); - list table_list = MakePartitionList(tg, columns, predicate); + term header = StorageFields::TableHeader(fields); + list table_list = StorageFields::TableContent(tg, fields, predicate); UI::ReplaceWidget(`tab_panel, `VBox( @@ -232,12 +237,14 @@ map disk = Storage::GetDisk(tg, device); map partition = Storage::GetPartition(tg, device); + list<symbol> fields = StorageFields::Filter([ `mount_point, `mount_by, `size, `stripes, + `fs_type, `uuid, `label ]); + UI::ReplaceWidget(`tree_panel, `VBox( `HStretch(), `Left(`Heading("Logical Volume: " + device)), - MakeInfo(disk, partition, [ `mount_point, `mount_by, `size, `stripes, `fs_type, - `uuid, `label ]), + StorageFields::Overview(disk, partition, fields), `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Sat Mar 1 20:13:46 2008 @@ -12,6 +12,7 @@ import "TabPanel"; import "TreePanel"; import "Popup"; + import "StorageFields"; // useful for e.g. ComboBox, SelectionBox and DumbTab @@ -34,350 +35,6 @@ } - list<symbol> FilterColumns(list<symbol> columns) - { - if (Arch::ppc()) - { - columns = filter(symbol s, columns, { return s != `cyl; }); - } - - if (!Arch::s390()) - { - columns = filter(symbol s, columns, { return s != `id; }); - } - - return columns; - } - - - term GetTableHeaderNew(list<symbol> columns) - { - columns = FilterColumns(columns); - - term header = `header(); - - // Column header - if (contains(columns, `device)) header = add(header, _("Device")); - - // Column header - if (contains(columns, `id)) header = add(header, _("ID")); - - // Column header: centered / minimum = 11 characters / - // fill with space if needed - if (contains(columns, `size)) header = add(header, `Right(_(" Size "))); - - // Column header: centered / minimum = 3 characters / - // fill with space if needed - if (contains(columns, `format)) header = add(header, `Right(_(" F "))); - - // Column header - if (contains(columns, `fs)) header = add(header, _("Type")); - - // Column header: centered / minimum = 7 characters / - // fill with space if needed - if (contains(columns, `mount)) header = add(header, _(" Mount ")); - - // Column header - if (contains(columns, `mount_by)) header = add(header, _("Mount By")); - - // Column header: minimum = 5 characters fill with space if needed - if (contains(columns, `cyl)) header = add(header, `Right(_("Start"))); - - // Column header: minimum = 4 characters fill with space if needed - if (contains(columns, `cyl)) header = add(header, `Right(_("End "))); - - // Column header - if (contains(columns, `used_by)) header = add(header, `Left(_("Used By"))); - - // Column header - if (contains(columns, `label)) header = add(header, `Left(_("Label"))); - - // Column header - if (contains(columns, `udev_id)) header = add(header, `Left(_("Device ID"))); - - // Column header - if (contains(columns, `udev_path)) header = add(header, `Left(_("Device Path"))); - - return header; - } - - - /** - * Sorted call of disk_cb for every disk. - */ - void IterateTargetMap(map<string, map> targets, void(map<string, map>, map) disk_cb) - { - // order should be md, then loop, then LVM, then EVMS - map disk_order = $[ `CT_DMRAID : 0, `CT_DISK : 1, `CT_MD : 2, `CT_LOOP : 3, - `CT_LVM : 4, `CT_EVMS : 5, `CT_DM : 6, `CT_NFS : 7 ]; - list<string> keys = maplist(string dev, map disk, targets, ``{ return dev; }); - keys = sort( string a, string b, keys, ``{ - integer oa = disk_order[targets[a,"type"]:`CT_UNKNOWN]:8; - integer ob = disk_order[targets[b,"type"]:`CT_UNKNOWN]:8; - return( (oa==ob) ? (a<b) : (oa<ob) ); - }); - - SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_c"), targets); - - foreach (string dev, keys, ``{ - map disk = targets[dev]:$[]; - disk_cb(targets, disk); - }); - }; - - - boolean AlwaysHideDisk(map<string, map> targets, map disk) - { - boolean real_disk = Storage::IsPartitionable(disk); - symbol type = disk["type"]:`CT_UNKNOWN; - - if( !(type==`CT_DISK && !real_disk) && - (type==`CT_DISK || type==`CT_DMRAID || type==`CT_LVM || - (type==`CT_EVMS && size(disk["name"]:"")>0 && - (!haskey( targets, "/dev/"+substring( disk["name"]:"", search( disk["name"]:"", "/")+1 ))|| - disk["create"]:false)))) - return false; - - return true; - } - - - boolean AlwaysHidePartition(map<string, map> targets, map disk, map partition) - { - boolean hide = partition["fsid"]:0 == Partitions::fsid_mac_hidden || - disk["used_by_type"]:`UB_NONE==`UB_DMRAID; - - if( !hide && search( partition["device"]:"", "/dev/evms/" )==0 ) - { - y2milestone( "evms p: %1", partition ); - string d1 = evms_dev_disk( partition["device"]:"" ); - y2milestone( "evms d1:%1", d1 ); - integer val = search( d1, "/lvm/" ); - if( val!=nil && val>0 ) - { - d1 = "/dev/" + substring( d1, 9 ); - } - else - { - val = search( d1, "/lvm2/" ); - if( val!=nil && val>0 ) - { - d1 = "/dev/" + substring( d1, 10 ); - } - } - hide = size(partition["mount"]:"")==0; - if( hide ) - { - y2milestone( "evms p: %1", Storage::GetPartition( targets, d1 )); - hide = (size(Storage::GetPartition( targets, d1 ))>0|| - Storage::IsPartType(targets[d1,"type"]:`CT_UNKNOWN)) && - !partition["evms_native"]:false; - } - y2milestone( "evms d1:%1 hide:%2", d1, hide ); - } - - return hide; - } - - - /** - * The predicate function determines whether the disk/partition is - * included. The predicate function takes two arguments, disk and - * partition. For disks predicate is called with the partitions set to - * nil. - * - * Possible return values for predicate: - * `show, `follow, `showandfollow, `ignore - */ - list<term> MakePartitionList(map<string, map> targets, list<symbol> columns, symbol(map, map) predicate) - { - columns = FilterColumns(columns); - - list<term> table_input = []; - - void disk_cb(map<string,map> targets, map disk) - { - symbol disk_predicate = predicate(disk, nil); - - boolean real_disk = Storage::IsPartitionable(disk); - - string dev = disk["device"]:""; - - if (!AlwaysHideDisk(targets, disk) && contains([`show, `showandfollow], disk_predicate)) - { - string vendor = disk["vendor"]:""; - string model = disk["model"]:""; - string dev_size = ByteToHumanString(disk["size_k"]:0*1024); - string udev_id = mergestring( disk["udev_id"]:[], " "); - string udev_path = disk["udev_path"]:""; - - if ( (model != "") && (vendor != "") ) - vendor = vendor + "-" + model; - else - vendor = vendor + model; - - // entry in column "Type" for a unknown disk - if( vendor == "" ) - { - if (disk["bus"]:"" == "RAID") - { - vendor = "RAID "+dev; - } - else if( disk["type"]:`CT_UNKNOWN==`CT_LVM ) - { - vendor = "LVM" + (disk["lvm2"]:false ? "2 " : " ") + - disk["name"]:""; - } - else if( disk["type"]:`CT_UNKNOWN==`CT_EVMS ) - { - vendor = "EVMS " + disk["name"]:""; - } - else if( disk["type"]:`CT_UNKNOWN==`CT_DMRAID ) - { - vendor = "BIOS RAID " + disk["name"]:""; - } - else - // label text - vendor = sformat( _("DISK %1"), substring( dev, 5 )); - } - - term a = `item(`id(dev)); - - if (contains(columns, `device)) a = add(a, dev ); - if (contains(columns, `id)) a = add(a, sformat( " (%1)", disk["bios_id"]:"" ) ); - if (contains(columns, `size)) a = add(a, dev_size ); - if (contains(columns, `format)) a = add(a, (disk["dasdfmt"]:false)?"X":" " ); - if (contains(columns, `fs)) a = add(a, vendor); - if (contains(columns, `mount)) a = add(a, "" ); - if (contains(columns, `mount_by)) a = add(a, ""); - - if (contains(columns, `cyl)) { - string dev_start_cyl = " -- "; - string dev_nb_cyl = " -- "; - if (real_disk) { - integer cyl_count = disk["cyl_count"]:0; - dev_start_cyl = to4string(0); - dev_nb_cyl = to4string(cyl_count==0?cyl_count:(cyl_count-1)); - } - a = add(a, dev_start_cyl); - a = add(a, dev_nb_cyl); - } - - if (contains(columns, `used_by)) a = add(a, usedByString( disk["used_by_type"]:`UB_NONE, - disk["used_by"]:"" )); - if (contains(columns, `label)) a = add(a, ""); - if (contains(columns, `udev_id)) a = add(a, udev_id); - if (contains(columns, `udev_path)) a = add(a, udev_path); - - table_input = add (table_input, a); - } - - if (contains([`follow, `showandfollow], disk_predicate)) - { - list<map> partitions = disk["partitions"]:[]; - - foreach(map partition, partitions, ``{ - - if (AlwaysHidePartition(targets, disk, partition)) - return; - - symbol part_predicate = predicate(disk, partition); - if (!contains([`show, `showandfollow], part_predicate)) - return; - - string part_dev_name = partition["device"]:""; - - integer start_cyl = partition["region",0]:0; - integer nb_cyl = partition["region",1]:0; - symbol type = partition["type"]:`unknown; - boolean format = partition["format"]:false; - boolean crypt_fs = partition["enc_type"]:`none != `none; - symbol used_fs = partition["used_fs"]:`unknown; - string mount_point = partition["mount"]:""; - symbol mount_by = partition["mountby"]:`device; - - string label = partition["label"]:""; - string udev_id = mergestring( partition["udev_id"]:[], " "); - string udev_path = partition["udev_path"]:""; - - string used_by = usedByString( partition["used_by_type"]:`UB_NONE, - partition["used_by"]:"" ); - - string bytes_of_part = ByteToHumanString( partition["size_k"]:0*1024 ); - - term a = `item(`id(part_dev_name)); - - if (contains(columns, `device)) a = add(a, part_dev_name ); - if (contains(columns, `id) ) a = add(a, ""); - if (contains(columns, `size) ) a = add(a, bytes_of_part); - if (contains(columns, `format) ) - { - string format_flag = ""; - if (format) format_flag = "F"; - if (crypt_fs) format_flag = "C" + format_flag; - a = add(a, format_flag); - } - if (contains(columns, `fs) ) - { - string filesystem_name = partition["fstype"]:""; - if( format && partition["fsid"]:0 == Partitions::fsid_native) - { - string fs_name = FileSystems::GetName( used_fs, "Ext2" ); - filesystem_name = filesystem_name + " (" + fs_name + ") "; - } - a = add(a, filesystem_name); - } - if (contains(columns, `mount) ) - { - string tmp = mount_point; - if( Mode::normal() && partition["inactive"]:false ) - { - tmp = tmp + " *"; - } - a = add(a, tmp ); - } - if(contains(columns, `mount_by)) - { - if (mount_point != "") - { - map tmp = $[ `device : "K", `uuid : "U", `label : "L", - `id : "I", `path : "P" ]; - a = add(a, tmp[mount_by]:""); - } - else - a = add(a, ""); - } - if(contains(columns, `cyl)) - { - if( real_disk ) { - a = add(a, to4string(start_cyl)); - integer num = start_cyl + nb_cyl - 1; - if( num<0 ) - num=0; - a = add(a, to4string(num)); - } else { - a = add(a, " -- "); - a = add(a, " -- "); - } - } - if(contains(columns, `used_by)) a = add(a, used_by); - if(contains(columns, `label)) a = add(a, label); - - if(contains(columns, `udev_id)) a = add(a, udev_id); - if(contains(columns, `udev_path)) a = add(a, udev_path); - - table_input = add (table_input, a); - }); - - } - } - - IterateTargetMap(targets, disk_cb); - - return table_input; - } - - void UpdateNavigationTree(any new_focus); @@ -457,7 +114,7 @@ map<string, map> tg = Storage::GetTargetMap(); - IterateTargetMap(tg, disk_cb); + StorageFields::IterateTargetMap(tg, disk_cb); list<term> tree = [ `item(`id(`all), "pandora", [ `item(`id(`hd), "Hard Disks", subtree[`hd]:[]), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp Sat Mar 1 20:13:46 2008 @@ -42,10 +42,12 @@ map disk = Storage::GetDisk(tg, part_device); map partition = Storage::GetPartition(tg, part_device); + list<symbol> fields = StorageFields::Filter([ `mount_point, `size, `raid_type ]); + UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - MakeInfo(disk, partition, [ `mount_point, `size, `raid_type ]), + StorageFields::Overview(disk, partition, fields), `VStretch(), `HBox( `PushButton(`id(`edit), "Edit..."), @@ -89,12 +91,12 @@ } } - list<symbol> columns = [ `device, `size, `format, `fs, `used_by ]; + list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, `used_by ]); - term header = GetTableHeaderNew(columns); + term header = StorageFields::TableHeader(fields); map<string, map> tg = Storage::GetTargetMap(); - list table_list = MakePartitionList(tg, columns, predicate); + list table_list = StorageFields::TableContent(tg, fields, predicate); UI::ReplaceWidget(`tab_panel, `VBox( Modified: branches/tmp/aschnell/part-redesign/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/inst_custom_part.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/inst_custom_part.ycp Sat Mar 1 20:13:46 2008 @@ -856,42 +856,6 @@ }; - /*--------------------------------------------------------------------- - * returns for nonnegative numbers a string with a minimum of 4 characters: - * 1 -> " 1" - * 22 -> " 22" - * 145 -> " 145" - * 2134 -> "2134" - * 34111 -> "34111" - *---------------------------------------------------------------------- - */ -define string to4string( integer nb ) - ``{ - if ( nb < 10 ) return( sformat( " %1", nb )); - if ( nb < 100 ) return( sformat( " %1", nb )); - if ( nb < 1000 ) return( sformat( " %1", nb )); - return( sformat( "%1", nb )); - }; - -define string usedByString( symbol ub_type, string used_by ) - { - string ret = ""; - if( ub_type == `UB_LVM ) - ret = "LVM " + used_by; - else if( ub_type == `UB_EVMS ) - ret = "EVMS " + used_by; - else if( ub_type == `UB_DM ) - ret = "DM " + used_by; - else if( ub_type == `UB_DMRAID ) - ret = "RAID " + used_by; - else if( ub_type == `UB_MD ) - ret = "RAID " + used_by; - else if( ub_type != `UB_NONE ) - ret = used_by; - return ret; - } - - /*------------------------------------------------------------------- * * Now check start an end cylinder Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Makefile.am Sat Mar 1 20:13:46 2008 @@ -19,6 +19,7 @@ StorageClients.ycp \ StorageControllers.ycp \ StorageDevices.ycp \ + StorageFields.ycp \ TreePanel.ycp \ TabPanel.ycp \ DualMultiSelectionBox.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp Sat Mar 1 20:13:46 2008 @@ -754,27 +754,6 @@ return( text ); } - /*--------------------------------------------------------------------- - * returns for a string a string with a minimum of 9 characters: - * "1" -> " 1" - * "22" -> " 22" - * "145" -> " 145" - * "2134" -> " 2134" - *---------------------------------------------------------------------- - */ -define string sto8string( string str ) - ``{ - integer nb = size( str ); - if ( nb > 8 ) return( sformat( "%1", str )); - if ( nb > 7 ) return( sformat( " %1", str )); - if ( nb > 6 ) return( sformat( " %1", str )); - if ( nb > 5 ) return( sformat( " %1", str )); - if ( nb > 4 ) return( sformat( " %1", str )); - if ( nb > 3 ) return( sformat( " %1", str )); - if ( nb > 2 ) return( sformat( " %1", str )); - if ( nb > 1 ) return( sformat( " %1", str )); - return( sformat( " %1", str )); - }; /*--------------------------------------------------------------------- * Convert <number-of-bytes> to XXX.X MB or XXX.X GB or XXX.X TB @@ -785,7 +764,7 @@ * * TODO: also defined in partition_defines.ycp, remove one */ -global define string ByteToHumanString ( integer number ) +global string ByteToHumanString(integer number) ``{ // column description, if disk space is not known if( number == 0 ) return( _("unknown") ); @@ -795,23 +774,39 @@ // < 1 GB integer MB = number / 1048576; integer hunKB = (number - (MB * 1048576)) / 104858; - return( sto8string(sformat( "%1.%2 MB", MB,hunKB ))); + return sformat("%1.%2 MB", MB, hunKB); } else if ( number < 1099511627776 ) { // < 1 TB integer GB = number / 1073741824; integer hunMB = (number - (GB * 1073741824)) / 107374183; - return( sto8string(sformat( "%1.%2 GB", GB,hunMB ))); + return sformat("%1.%2 GB", GB, hunMB); } else { // >= 1 TB integer TB = number / 1099511627776; integer hunGB = (number - (TB * 1099511627776)) / 109951162778; - return( sto8string(sformat( "%1.%2 TB", TB,hunGB ))); + return sformat("%1.%2 TB", TB, hunGB); } }; +/*--------------------------------------------------------------------- + * Convert <number-of-bytes> to XXX.X MB or XXX.X GB or XXX.X TB + * + * see also ByteToHumanString ! + * Return value: string "0" if input == 0 + *---------------------------------------------------------------------- + */ +global string ByteToHumanStringWithZero(integer number) +{ + if (number == 0) + return sformat("%1.%2 MB", 0, 0); + + return ByteToHumanString(number); +}; + + } Added: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (added) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Sat Mar 1 20:13:46 2008 @@ -0,0 +1,643 @@ +/** + * File: StorageFields.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Arvin Schnell <aschnell(a)suse.de> + * + */ +{ + module "StorageFields"; + + + textdomain "storage"; + + + import "Storage"; + import "FileSystems"; + import "Partitions"; + import "Arch"; + import "Mode"; + + + global list<symbol> Filter(list<symbol> fields) + { + if (Arch::ppc()) + { + fields = filter(symbol field, fields, { + return field != `start_cyl && field != `end_cyl; + }); + } + + if (!Arch::s390()) + { + fields = filter(symbol field, fields, { + return field != `bios_id; + }); + } + + return fields; + } + + + /** + * Sorted call of disk_cb for every disk. + */ + global void IterateTargetMap(map<string, map> targets, void(map<string, map>, map) disk_cb) + { + map disk_order = $[ `CT_DMRAID : 0, `CT_DISK : 1, `CT_MD : 2, `CT_LOOP : 3, + `CT_LVM : 4, `CT_EVMS : 5, `CT_DM : 6, `CT_NFS : 7 ]; + list<string> keys = maplist(string dev, map disk, targets, { return dev; }); + keys = sort(string a, string b, keys, { + integer oa = disk_order[targets[a,"type"]:`CT_UNKNOWN]:8; + integer ob = disk_order[targets[b,"type"]:`CT_UNKNOWN]:8; + return (oa==ob) ? (a<b) : (oa<ob); + }); + + SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_c"), targets); + + foreach(string dev, keys, { + map disk = targets[dev]:$[]; + disk_cb(targets, disk); + }); + }; + + + string UsedByString(symbol ub_type, string used_by) + { + switch(ub_type) + { + case `UB_LVM: + return "LVM " + used_by; + case `UB_EVMS: + return "EVMS " + used_by; + case `UB_DM: + return "DM " + used_by; + case `UB_DMRAID: + return "RAID " + used_by; + case `UB_MD: + return "RAID " + used_by; + default: + return used_by; + } + } + + + global term TableHeader(list<symbol> fields) + { + term header = `header(); + + foreach(symbol field, fields, { + + switch (field) + { + case `device: + // Column header + header = add(header, _("Device")); + break; + + case `size: + // Column header: centered / minimum = 11 characters / + // fill with space if needed + header = add(header, `Right(_(" Size "))); + break; + + case `type: + // Column header + header = add(header, _("Type")); + break; + + case `format: + // Column header: centered / minimum = 3 characters / + // fill with space if needed + header = add(header, `Right(_(" F "))); + break; + + case `mount_point: + // Column header: centered / minimum = 7 characters / + // fill with space if needed + header = add(header, _(" Mount ")); + break; + + case `mount_by: + // Column header + header = add(header, _("Mount By")); + break; + + case `used_by: + // Column header + header = add(header, _("Used By")); + break; + + case `start_cyl: + // Column header: minimum = 5 characters / fill with space if needed + header = add(header, `Right(_("Start"))); + break; + + case `end_cyl: + // Column header: minimum = 4 characters / fill with space if needed + header = add(header, `Right(_("End "))); + break; + + case `uuid: + // Column header + header = add(header, _("UUID")); + break; + + case `label: + // Column header + header = add(header, _("Label")); + break; + + case `udev_path: + // Column header + header = add(header, _("Device Path")); + break; + + case `udev_id: + // Column header + header = add(header, _("Device ID")); + break; + + case `bios_id: + // Column header + header = add(header, _("BIOS ID")); + break; + + case `lvm_metadata: + // Column header + header = add(header, _("Metadata")); + break; + + case `pe_size: + // Column header + header = add(header, _("PE Size")); + break; + + case `stripes: + // Column header + header = add(header, _("Stripes")); + break; + + case `raid_type: + // Column header + header = add(header, _("RAID Type")); + break; + + default: + y2error("unknown field %1", field); + header = add(header, ""); + break; + } + + }); + + return header; + } + + + string MakeSubInfo(map disk, map part, symbol field, symbol style) + { + map data = (part == nil ? disk : part); + + switch (field) + { + case `device: + { + string value = data["device"]:""; + if (style == `table) + return value; + else + return "Device: " + value + "\n"; + } + + case `size: + { + string value = Partitions::ByteToHumanStringWithZero(data["size_k"]:0*1024); + if (style == `table) + return value; + else + return "Size: " + value + "\n"; + } + + case `type: + { + string value = ""; + + if (part == nil) + { + string disk_device = disk["device"]:""; + string vendor = disk["vendor"]:""; + string model = disk["model"]:""; + + if ((model != "") && (vendor != "")) + value = vendor + "-" + model; + else + value = vendor + model; + + if (value == "") + { + if (disk["bus"]:"" == "RAID") + { + value = "RAID " + disk_device; + } + else if(disk["type"]:`CT_UNKNOWN==`CT_LVM) + { + value = "LVM" + (disk["lvm2"]:false ? "2 " : " ") + disk["name"]:""; + } + else if(disk["type"]:`CT_UNKNOWN==`CT_EVMS) + { + value = "EVMS " + disk["name"]:""; + } + else if(disk["type"]:`CT_UNKNOWN==`CT_DMRAID) + { + value = "BIOS RAID " + disk["name"]:""; + } + else + { + // label text + vendor = sformat(_("DISK %1"), substring(disk_device, 5)); + } + } + } + else + { + value = part["fstype"]:""; + if (part["format"]:false && part["fsid"]:0 == Partitions::fsid_native) + { + symbol used_fs = part["used_fs"]:`unknown; + string fs_name = FileSystems::GetName(used_fs, "Ext2"); + value = value + " (" + fs_name + ") "; + } + } + if (style == `table) + return value; + else + return "Type: " + value + "\n"; + } + + case `format: + { + string value = ""; + if (part == nil) { + if (disk["dasdfmt"]:false) + value = value + "X"; + } else { + if (part["enc_type"]:`none != `none) + value = value + "C"; + if (part["format"]:false) + value = value + "F"; + } + if (style == `table) + return value; + else + return "Format: " + value + "\n"; + } + + case `encrypted: + { + string value = data["enc_type"]:`none != `none ? "Yes" : "No"; + if (style == `table) + return value; + else + return "Encrypted: " + value + "\n"; + } + + case `fs_type: + { + string value = FileSystems::GetName(data["used_fs"]:`unknown, ""); + if (style == `table) + return value; + else + return "File System: " + value + "\n"; + } + + case `mount_point: + { + string value = data["mount"]:""; + if (Mode::normal() && data["inactive"]:false ) + value = value + " *"; + if (style == `table) + return value; + else + return "Mount Point: " + value + "\n"; + } + + case `mount_by: + { + string value = ""; + if (data["mount"]:"" != "") { + map tmp = $[ `device : "K", `uuid : "U", `label : "L", `id : "I", `path : "P" ]; + symbol mount_by = data["mountby"]:`device; + value = tmp[mount_by]:""; + } + if (style == `table) + return value; + else + return "Mount By: " + value + "\n"; + } + + case `used_by: + { + string value = UsedByString(data["used_by_type"]:`UB_NONE, data["used_by"]:""); + if (style == `table) + return value; + else + return "Used By: " + value + "\n"; + } + + case `uuid: + { + string value = data["uuid"]:""; + if (style == `table) + return value; + else + return "UUID: " + value + "\n"; + } + + case `label: + { + string value = part == nil ? "" : data["label"]:""; + if (style == `table) + return value; + else + return "Label: " + value + "\n"; + } + + case `udev_path: + { + string value = data["udev_path"]:""; + if (style == `table) + return value; + else + return "Path: " + data["udev_path"]:"" + "\n"; + } + + case `udev_id: + { + if (style == `table) { + return mergestring(data["udev_id"]:[], " "); + } else { + string ret = ""; + integer i = 1; + foreach(string id, data["udev_id"]:[], { + ret = ret + "ID " + i + ": " + id + "\n"; + i = i + 1; + }); + return ret; + } + } + + case `bios_id: + { + string value = data["bios_id"]:""; + if (style == `table) + return value; + else + return "BIOS ID: " + value + "\n"; + } + + case `vendor: + { + string value = data["vendor"]:""; + if (style == `table) + return value; + else + return "Vendor: " + value + "\n"; + } + + case `model: + { + string value = data["model"]:""; + if (style == `table) + return value; + else + return "Model: " + value + "\n"; + } + + case `bus: + { + string value = data["bus"]:""; + if (style == `table) + return value; + else + return "Bus: " + value + "\n"; + } + + case `lvm_metadata: + { + string value = ""; + if (disk["type"]:`CT_UNKNOWN == `CT_LVM && part == nil) + value = disk["lvm2"]:true ? "LVM2" : "LVM1"; + if (style == `table) + return value; + else + return "Metadata Type: " + value + "\n"; + } + + case `pe_size: + { + string value = ""; + if (disk["type"]:`CT_UNKNOWN == `CT_LVM && part == nil) + value = sformat("%1", disk["pesize"]:0); // FIXME + if (style == `table) + return value; + else + return "Physical Extent Size: " + value + "\n"; + } + + case `stripes: + { + string value = ""; + if (disk["type"]:`CT_UNKNOWN == `CT_LVM && part != nil) + { + integer stripes = data["stripes"]:1; + integer stripesize = data["stripesize"]:0; + if (stripes == 1) + value = sformat("%1", stripes); + else + value = sformat("%1 (%2)", stripes, stripesize); // FIXME + } + if (style == `table) + return value; + else + return "Stripes: " + value + "\n"; + } + + case `raid_type: + { + string value = data["raid_type"]:""; + if (style == `table) + return value; + else + return "RAID Type: " + value + "\n"; + } + + case `start_cyl: + { + string value = "--"; + if (Storage::IsPartitionable(disk)) { + if (part == nil) + value = sformat("%1", 0); + else + value = sformat("%1", part["region", 0]:0); + } + if (style == `table) + return value; + else + return "Start Cylinder: " + value + "\n"; + } + + case `end_cyl: + { + string value = "--"; + if (Storage::IsPartitionable(disk)) { + if (part == nil) + value = sformat("%1", disk["cyl_count"]:0 - 1); + else + value = sformat("%1", part["region", 0]:0 + part["region", 1]:0 - 1); + } + if (style == `table) + return value; + else + return "End Cylinder: " + value + "\n"; + } + + default: + { + y2error("unknown field %1", field); + if (style == `table) + return "error"; + else + return "error\n"; + } + } + } + + + term TableRow(map disk, map part, list<symbol> fields) + { + string device = part == nil ? disk["device"]:"" : part["device"]:""; + + term row = `item(`id(device)); + foreach(symbol field, fields, { + row = add(row, MakeSubInfo(disk, part, field, `table)); + }); + + return row; + } + + + boolean AlwaysHideDisk(map<string, map> target_map, map disk) + { + boolean real_disk = Storage::IsPartitionable(disk); + symbol type = disk["type"]:`CT_UNKNOWN; + + if( !(type==`CT_DISK && !real_disk) && + (type==`CT_DISK || type==`CT_DMRAID || type==`CT_LVM || + (type==`CT_EVMS && size(disk["name"]:"")>0 && + (!haskey(target_map, "/dev/"+substring(disk["name"]:"", search( disk["name"]:"", "/")+1))|| + disk["create"]:false)))) + return false; + + return true; + } + + + boolean AlwaysHidePartition(map<string, map> target_map, map disk, map partition) + { + boolean hide = partition["fsid"]:0 == Partitions::fsid_mac_hidden || + disk["used_by_type"]:`UB_NONE==`UB_DMRAID; + + if( !hide && search( partition["device"]:"", "/dev/evms/" )==0 ) + { + y2milestone( "evms p: %1", partition ); + string d1 = Storage::EvmsDevDisk(partition["device"]:""); + y2milestone( "evms d1:%1", d1 ); + integer val = search( d1, "/lvm/" ); + if( val!=nil && val>0 ) + { + d1 = "/dev/" + substring( d1, 9 ); + } + else + { + val = search( d1, "/lvm2/" ); + if( val!=nil && val>0 ) + { + d1 = "/dev/" + substring( d1, 10 ); + } + } + hide = size(partition["mount"]:"")==0; + if( hide ) + { + y2milestone( "evms p: %1", Storage::GetPartition(target_map, d1)); + hide = (size(Storage::GetPartition(target_map, d1))>0|| + Storage::IsPartType(target_map[d1,"type"]:`CT_UNKNOWN)) && + !partition["evms_native"]:false; + } + y2milestone( "evms d1:%1 hide:%2", d1, hide ); + } + + return hide; + } + + + /** + * The predicate function determines whether the disk/partition is + * included. The predicate function takes two arguments, disk and + * partition. For disks predicate is called with the partitions set to + * nil. + * + * Possible return values for predicate: + * `show, `follow, `showandfollow, `ignore + */ + global list<term> TableContent(map<string, map> target_map, list<symbol> fields, + symbol(map, map) predicate) + { + list<term> content = []; + + void callback(map<string, map> target_map, map disk) + { + symbol disk_predicate = predicate(disk, nil); + + if (!AlwaysHideDisk(target_map, disk) && + contains([`show, `showandfollow], disk_predicate)) + { + term row = StorageFields::TableRow(disk, nil, fields); + content = add(content, row); + } + + if (contains([`follow, `showandfollow], disk_predicate)) + { + list<map> partitions = disk["partitions"]:[]; + + foreach(map partition, partitions, { + + symbol part_predicate = predicate(disk, partition); + + if (!AlwaysHidePartition(target_map, disk, partition) && + contains([`show, `showandfollow], part_predicate)) + { + term row = StorageFields::TableRow(disk, partition, fields); + content = add(content, row); + } + }); + } + } + + IterateTargetMap(target_map, callback); + + return content; + } + + + global term Overview(map disk, map part, list<symbol> fields) + { + string ret = mergestring(maplist(symbol field, fields, { + if (field == `newline) + return "\n"; + else + return MakeSubInfo(disk, part, field, `overview); + }), ""); + return `RichText(`opt(`plainText), ret); + } +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45146 - /trunk/devtools/yast2/ycp-mode.el
by aschnell＠svn.opensuse.org 01 Mar '08

01 Mar '08

Author: aschnell Date: Sat Mar 1 12:44:51 2008 New Revision: 45146 URL: http://svn.opensuse.org/viewcvs/yast?rev=45146&view=rev Log: - added "switch", "case" and "default" Modified: trunk/devtools/yast2/ycp-mode.el Modified: trunk/devtools/yast2/ycp-mode.el URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/yast2/ycp-mode.el?rev=4… ============================================================================== --- trunk/devtools/yast2/ycp-mode.el (original) +++ trunk/devtools/yast2/ycp-mode.el Sat Mar 1 12:44:51 2008 @@ -50,6 +50,7 @@ (eval-when-compile (regexp-opt '("if" "else" "while" "do" "repeat" "until" "continue" "return" "define" "break" + "switch" "case" "default" "empty" "textdomain")))) (ycp-builtin-types (eval-when-compile -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0