Author: aschnell Date: Wed Aug 12 16:12:53 2009 New Revision: 58331 URL: http://svn.opensuse.org/viewcvs/yast?rev=58331&view=rev Log: - stricter typing - some cleanup Modified: trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_lib.ycp?rev=58331&r1=58330&r2=58331&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Wed Aug 12 16:12:53 2009 @@ -537,8 +537,7 @@ define boolean EmptyCryptPwdAllowed( map p ) { boolean ret = p["format"]:false && - contains( union(FileSystems::tmp_m_mpoint,["swap"]), - p["mount"]:"" ); + contains(union(FileSystems::tmp_m_points, FileSystems::swap_m_points), p["mount"]:""); ret = ret && Storage::IsPersistent( p ); y2milestone( "EmptyCryptPwdAllowed ret:%1", ret ); return( ret ); Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=58331&r1=58330&r2=58331&view=diff ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Wed Aug 12 16:12:53 2009 @@ -59,12 +59,14 @@ return( ret ); } - global list<string> system_m_points = [ "/", "/usr", "/var", "/opt", - Partitions::BootMount() ]; - global list<string> crypt_m_points = [ "/", Partitions::BootMount(), "/usr" ]; - list<string> suggest_m_points = []; - global list<string> swap_m_points = [ "swap" ]; - global list<string> tmp_m_mpoint = [ "/tmp", "/var/tmp" ]; + + global const list<string> system_m_points = [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ]; + global const list<string> crypt_m_points = [ "/", Partitions::BootMount(), "/usr" ]; + global const list<string> swap_m_points = [ "swap" ]; + global const list<string> tmp_m_points = [ "/tmp", "/var/tmp" ]; + + list<string> suggest_m_points = []; + global string nchars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -83,8 +85,9 @@ any sint = nil; -define list FstabOptionStrings = - [ "defaults", + + const list<string> FstabOptionStrings = [ + "defaults", "auto", "noauto", "atime", "noatime", "ro", "rw", @@ -103,16 +106,19 @@ "usrquota", "grpquota" ]; -define list FstabOptionRegex = [ "pri=[0-9]\+", "iocharset=.\+", "utf8=\.*", + const list<string> FstabOptionRegex = [ + "pri=[0-9]\+", "iocharset=.\+", "utf8=\.*", "nls=.\+", "codepage=.\+", "gid=[0-9]\+", "umask=[0-7]\+", "loop=.\+", "encryption=.\+", "pri=[0-9]\+", "locale=\.\+", "fmask=[0-7]\+", "dmask=[0-7]\+", - "usrjquota=.\+", "grpjquota=.\+", "jqfmt=.\+" ]; + "usrjquota=.\+", "grpjquota=.\+", "jqfmt=.\+" + ]; + -define map FstabDefaultMap = - $[ "pts": $[ "spec":"devpts", "mount":"/dev/pts", "vfstype":"devpts", + const map FstabDefaultMap = $[ + "pts": $[ "spec":"devpts", "mount":"/dev/pts", "vfstype":"devpts", "mntops":"mode=0620,gid=5", "freq":0, "passno":0 ], "proc": $[ "spec":"proc", "mount":"/proc", "vfstype":"proc", "mntops":"defaults", "freq":0, "passno":0 ], @@ -1373,22 +1379,17 @@ return( ret ); } -global define map GetFstabDefaultMap( string key ) - ``{ - return( FstabDefaultMap[key]:$[] ); - } -global define string GetFstabDefaultMntops( string key ) - ``{ - map m = GetFstabDefaultMap( key ); - return( m["mntops"]:"" ); + global map GetFstabDefaultMap(string key) + { + return FstabDefaultMap[key]:$[]; } -global define list GetFstabDefaultList( string key ) - ``{ - map m = GetFstabDefaultMap( key ); - return( [ m["spec"]:"", m["mount"]:"", m["vfstype"]:"", m["mntops"]:"", - tostring(m["freq"]:0), tostring(m["passno"]:0) ] ); + global list<string> GetFstabDefaultList(string key) + { + map m = GetFstabDefaultMap(key); + return [ m["spec"]:"", m["mount"]:"", m["vfstype"]:"", m["mntops"]:"", + tostring(m["freq"]:0), tostring(m["passno"]:0) ]; } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=58331&r1=58330&r2=58331&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Aug 12 16:12:53 2009 @@ -5177,9 +5177,9 @@ if( mount_point == "swap" ) { vfstype = "swap"; - if( size(mntops) == 0 ) + if (isempty(mntops)) { - mntops = FileSystems::GetFstabDefaultMntops( "swap" ); + mntops = FileSystems::GetFstabDefaultMap("swap")["mntops"]:""; } passno = 0; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org