Author: aschnell Date: Sat Dec 20 12:05:07 2008 New Revision: 54310 URL: http://svn.opensuse.org/viewcvs/yast?rev=54310&view=rev Log: - use new builtin tosymbol Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp trunk/storage/storage/src/include/ep-raid-lib.ycp trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/StorageSettings.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-raid-dialogs.ycp?rev=54310&r1=54309&r2=54310&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Sat Dec 20 12:05:07 2008 @@ -92,7 +92,7 @@ integer callback(list<map> devices) { integer sizeK = 0; - Storage::ComputeMdSize(symbolof(toterm(raid_type)), maplist(map device, devices, { return device["device"]:""; }), sizeK); + Storage::ComputeMdSize(tosymbol(raid_type), maplist(map device, devices, { return device["device"]:""; }), sizeK); return sizeK; } @@ -173,7 +173,7 @@ data["devices"] = devices; integer size_k = 0; - Storage::ComputeMdSize(symbolof(toterm(raid_type)), devices, size_k); + Storage::ComputeMdSize(tosymbol(raid_type), devices, size_k); data["size_k"] = size_k; } @@ -283,7 +283,7 @@ integer callback(list<map> devices) { integer sizeK = 0; - Storage::ComputeMdSize(symbolof(toterm(raid_type)), maplist(map device, devices, { return device["device"]:""; }), sizeK); + Storage::ComputeMdSize(tosymbol(raid_type), maplist(map device, devices, { return device["device"]:""; }), sizeK); return sizeK; } Modified: trunk/storage/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-raid-lib.ycp?rev=54310&r1=54309&r2=54310&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-raid-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-lib.ycp Sat Dec 20 12:05:07 2008 @@ -59,7 +59,7 @@ if (DlgCreateRaidNew(data)) { integer nr = data["nr"]:0; - symbol raid_type = symbolof(toterm(data["raid_type"]:"raid0")); + symbol raid_type = tosymbol(data["raid_type"]:"raid0"); if (Storage::CreateMdWithDevs(nr, raid_type, [])) { Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Partitions.ycp?rev=54310&r1=54309&r2=54310&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Sat Dec 20 12:05:07 2008 @@ -145,7 +145,7 @@ if (tmp == nil || !contains([ "ext2", "ext3", "reiser", "xfs" ], tolower(tmp))) tmp = "ext3"; - default_fs = symbolof(toterm(tolower(tmp))); + default_fs = tosymbol(tolower(tmp)); } return default_fs; } Modified: trunk/storage/storage/src/modules/StorageSettings.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageSettings.ycp?rev=54310&r1=54309&r2=54310&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageSettings.ycp (original) +++ trunk/storage/storage/src/modules/StorageSettings.ycp Sat Dec 20 12:05:07 2008 @@ -33,7 +33,7 @@ if (tmp == nil || !contains([ "device", "id", "path" ], tolower(tmp))) tmp = "device"; - display_name = symbolof(toterm(tolower(tmp))); + display_name = tosymbol(tolower(tmp)); } return display_name; @@ -80,7 +80,7 @@ tmp = ""; hidden_fields = toset(maplist(string field, splitstring(tmp, " \t"), { - return symbolof(toterm(tolower(field))); + return tosymbol(tolower(field)); })); } Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?rev=54310&r1=54309&r2=54310&view=diff ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Sat Dec 20 12:05:07 2008 @@ -1,11 +1,12 @@ @HEADER-COMMENT@ - @HEADER@ -BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite yast2-perl-bindings -Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools kpartx cryptsetup -Requires: yast2-core >= 2.17.10 -Requires: yast2 >= 2.17.45 +BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig +BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel +BuildRequires: update-desktop-files yast2 yast2-core-devel >= 2.18.0 yast2-devtools +BuildRequires: yast2-testsuite yast2-perl-bindings +Requires: yast2-storage-lib = %version yast2-perl-bindings parted mdadm lvm2 dmraid +Requires: multipath-tools kpartx cryptsetup yast2-core >= 2.18.0 yast2 >= 2.17.45 Requires: yast2-libyui >= 2.17.5 %ifarch s390 s390x Requires: yast2-s390 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org