Author: aschnell Date: Thu Jul 31 14:22:02 2008 New Revision: 49540 URL: http://svn.opensuse.org/viewcvs/yast?rev=49540&view=rev Log: - define GetDeviceName just onces Removed: trunk/storage/storage/src/modules/routines.ycp Modified: trunk/storage/storage/src/modules/Makefile.am trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageDevices.ycp Modified: trunk/storage/storage/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Makefile.am?rev=49540&r1=49539&r2=49540&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Makefile.am (original) +++ trunk/storage/storage/src/modules/Makefile.am Thu Jul 31 14:22:02 2008 @@ -7,11 +7,6 @@ YCPC_LD_LIBRARY_PATH = ../../../libstorage/src/.libs YCPC_Y2DIR = ../../../libstorage/src/.libs -yncludedir = @yncludedir@/storage - -ynclude_DATA = \ - routines.ycp - module_DATA = \ Partitions.ycp \ FileSystems.ycp \ @@ -20,7 +15,7 @@ StorageControllers.ycp \ StorageDevices.ycp -EXTRA_DIST = $(module_DATA) $(ynclude_DATA) +EXTRA_DIST = $(module_DATA) include: mkdir include && ln -sf ../../include include/partitioning Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=49540&r1=49539&r2=49540&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Jul 31 14:22:02 2008 @@ -173,9 +173,6 @@ string part_insts = ""; - /* - include "storage/routines.ycp"; - */ /** * Returns Device Name * Modified: trunk/storage/storage/src/modules/StorageDevices.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageDevices.ycp?rev=49540&r1=49539&r2=49540&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageDevices.ycp (original) +++ trunk/storage/storage/src/modules/StorageDevices.ycp Thu Jul 31 14:22:02 2008 @@ -103,33 +103,6 @@ } - /** - * - #include "storage/routines.ycp"; - */ -global define string GetDeviceName( string disk, any partition ) - ``{ - string ret = disk; - - if( is( partition, integer ) ) - { - if( search( disk, "/dev/cciss/" )==0 || - search( disk, "/dev/ida/" )==0 || - search( disk, "/dev/ataraid/" )==0 || - search( disk, "/dev/etherd/" )==0 || - search( disk, "/dev/rd/" )==0 ) - { - ret = ret + "p"; - } - ret = ret + sformat( "%1", partition ); - } - else if( size( (string)partition )>0 ) - { - ret = ret + "/" + (string)partition; - } - return( ret ); - }; - global define list<map> AddNormalLinknames( list<map> cddrives ) ``{ map linknum = $[ "cdrom" : 0, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org