Author: jreidinger Date: Thu Apr 16 14:57:35 2009 New Revision: 56812 URL: http://svn.opensuse.org/viewcvs/yast?rev=56812&view=rev Log: remove swapItems function and replace it with list::swap Modified: trunk/bootloader/src/grub/options.ycp trunk/bootloader/src/routines/global_widgets.ycp trunk/bootloader/src/routines/misc.ycp trunk/bootloader/yast2-bootloader.spec.in Modified: trunk/bootloader/src/grub/options.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/options.ycp?rev=56812&r1=56811&r2=56812&view=diff ============================================================================== --- trunk/bootloader/src/grub/options.ycp (original) +++ trunk/bootloader/src/grub/options.ycp Thu Apr 16 14:57:35 2009 @@ -367,11 +367,11 @@ if (action == `up){ changed= true; disksOrder = - (list<term>) BootCommon::swapItems (disksOrder, pos, pos - 1); + (list<term>) list::swap (disksOrder, pos, pos - 1); } else if (action == `down){ changed= true; disksOrder = - (list<term>) BootCommon::swapItems (disksOrder, pos, pos + 1); + (list<term>) list::swap (disksOrder, pos, pos + 1); } else if (action == `delete){ changed = true; disksOrder = remove(disksOrder,pos); Modified: trunk/bootloader/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/global_widgets.ycp?rev=56812&r1=56811&r2=56812&view=diff ============================================================================== --- trunk/bootloader/src/routines/global_widgets.ycp (original) +++ trunk/bootloader/src/routines/global_widgets.ycp Thu Apr 16 14:57:35 2009 @@ -181,7 +181,7 @@ symbol updownHandle(string key, map event, boolean up, integer index){ integer second = up ? (index-1):(index+1); BootCommon::sections = (list >) - BootCommon::swapItems(BootCommon::sections, index, second); + list::swap(BootCommon::sections, index, second); RedrawSectionsTable (BootCommon::sections); return nil; } Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=56812&r1=56811&r2=56812&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Thu Apr 16 14:57:35 2009 @@ -828,38 +828,6 @@ return filter(any e, a, ``(!contains(b, e))); } - - /** - * returns modified list where items index1 and index2 are swapped. - * if indices are out of bounds, unmodified list is returned. - * @param input list - * @param index1 index of the first element - * @param index2 index og the second element - * @return list modified list - */ - global define list swapItems(list input, integer index1, integer index2) ``{ - if (index1 >= size(input) || index2 >= size(input) - || index1 < 0 || index2 < 0) - { - return input; - } - list output = []; - integer pos = -1; - output = maplist(any e, input, { - pos = pos + 1; - if (pos == index1) - { - return (any)(input[index2]:(any)$[]); - } - else if (pos == index2) - { - return (any)(input[index1]:(any)$[]); - } - return e; - }); - return output; - } - /** * translate filename path (eg. /boot/kernel) to list of device * and relative path Modified: trunk/bootloader/yast2-bootloader.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/yast2-bootloader.spec.in?rev=56812&r1=56811&r2=56812&view=diff ============================================================================== --- trunk/bootloader/yast2-bootloader.spec.in (original) +++ trunk/bootloader/yast2-bootloader.spec.in Thu Apr 16 14:57:35 2009 @@ -10,11 +10,13 @@ Requires: yast2-packager >= 2.17.24 Requires: yast2-pkg-bindings >= 2.17.25 Requires: perl-Bootloader >= 0.4.80 -Requires: yast2-core yast2-storage perl-Bootloader parted perl-Compress-Zlib limal-perl +Requires: yast2-core >= 2.18.6 +Requires: yast2-storage parted perl-Compress-Zlib limal-perl BuildRequires: yast2 >= 2.18.14 BuildRequires: yast2-packager >= 2.17.24 BuildRequires: yast2-pkg-bindings >= 2.17.25 BuildRequires: perl-Bootloader >= 0.4.91 +BuildRequires: yast2-core >= 2.18.6 %ifarch %ix86 x86_64 Requires: master-boot-code -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org