Author: aschnell
Date: Mon Jan 25 11:01:22 2010
New Revision: 60500
URL: http://svn.opensuse.org/viewcvs/yast?rev=60500&view=rev
Log:
- simplified GetMountString and GetNeededModules
Modified:
trunk/storage/storage/src/modules/FileSystems.ycp
Modified: trunk/storage/storage/src/modules/FileSystems.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=60500&r1=60499&r2=60500&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/FileSystems.ycp (original)
+++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Jan 25 11:01:22 2010
@@ -18,9 +18,7 @@
import "Arch";
import "String";
import "Partitions";
- import "Popup";
import "Encoding";
- import "Mode";
import "Stage";
import "LibStorage";
@@ -1018,38 +1016,22 @@
* Return the mount option for each used_fs (-t)
* @return string
*/
- global define string GetMountString(symbol used_fs, string defaultv )``{
- map fsmap = GetFsMap( used_fs);
- string ret = fsmap[`mount_string ]:"";
- if( size(ret)==0 )
- {
- if( used_fs == `vfat )
- {
- ret = "vfat";
- }
- else if( used_fs == `ntfs )
- {
- ret = "ntfs-3g";
- }
- }
- if( ret == "" ) ret = defaultv;
- y2milestone( "used_fs:%1 ret:%2", used_fs, ret );
- return ret;
- }
+ global string GetMountString(symbol used_fs, string defaultv)
+ {
+ map fsmap = GetFsMap(used_fs);
+ string ret = fsmap[`mount_string ]:defaultv;
+ y2milestone("GetMountString used_fs:%1 ret:%2", used_fs, ret);
+ return ret;
+ }
- global define list<string> GetNeededModules( symbol used_fs )``{
- list<string> ret = [];
- map fsmap = GetFsMap( used_fs);
- if( used_fs==`ntfs && size(fsmap)==0 )
- {
- ret = ["ntfs"];
- }
- else
- {
- ret = fsmap[`needed_modules ]:[];
- }
- return ret;
- }
+
+ global list<string> GetNeededModules(symbol used_fs)
+ {
+ map fsmap = GetFsMap(used_fs);
+ list<string> ret = fsmap[`needed_modules ]:[];
+ y2milestone("GetNeededModules used_fs:%1 ret:%2", used_fs, ret);
+ return ret;
+ }
global integer MinFsSizeK(symbol fsys)
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
