[yast-commit] r50024 - in /trunk/storage: VERSION package/yast2-storage.changes storage/src/modules/Partitions.ycp storage/src/modules/StorageFields.ycp yast2-storage.spec.in
Author: aschnell Date: Wed Aug 13 16:01:43 2008 New Revision: 50024 URL: http://svn.opensuse.org/viewcvs/yast?rev=50024&view=rev Log: - display fibre channel information (fate #304333) Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/StorageFields.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=50024&r1=50023&r2=50024&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Wed Aug 13 16:01:43 2008 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=50024&r1=50023&r2=50024&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Aug 13 16:01:43 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 13 15:16:27 CEST 2008 - aschnell@suse.de + +- display fibre channel information (fate #304333) +- version 2.17.17 + +------------------------------------------------------------------- Tue Aug 12 19:32:35 CEST 2008 - aschnell@suse.de - improved logging during disk detection Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Partitions.ycp?rev=50024&r1=50023&r2=50024&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Wed Aug 13 16:01:43 2008 @@ -565,23 +565,11 @@ return( file ); }; -global define string ToHexString( integer num ) - ``{ - string to_hex = "0123456789ABCDEF"; - string ret = ""; - if( num>256 ) - { - ret = sformat("0x%1%2%3", substring( to_hex, num/256, 1 ), - substring( to_hex, (num%256)/16, 1 ), - substring( to_hex, num%16, 1 ) ); - } - else - { - ret = sformat("0x%1%2", substring( to_hex, num/16, 1 ), - substring( to_hex, num%16, 1 ) ); - } - return( ret ); - } + +global string ToHexString(integer num) +{ + return "0x" + toupper(substring(tohexstring(num, 2), 2)); +} global string FsIdToString(integer fs_id) Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageFields.ycp?rev=50024&r1=50023&r2=50024&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Wed Aug 13 16:01:43 2008 @@ -636,7 +636,7 @@ { string value = ""; if (haskey(data["fc"]:$[], "wwpn")) - value = tostring(data["fc", "wwpn"]:0); + value = "0x" + toupper(substring(tohexstring(data["fc", "wwpn"]:0, 8), 2)); if (style == `table) return value; else Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?rev=50024&r1=50023&r2=50024&view=diff ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Wed Aug 13 16:01:43 2008 @@ -4,7 +4,7 @@ @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 kpartx cryptsetup -Requires: yast2-core >= 2.17.1 +Requires: yast2-core >= 2.17.8 Requires: yast2 >= 2.17.3 Requires: yast2-libyui >= 2.17.5 %ifarch s390 s390x -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
aschnell@svn.opensuse.org