Author: aschnell Date: Fri Aug 29 15:55:06 2008 New Revision: 50487 URL: http://svn.opensuse.org/viewcvs/yast?rev=50487&view=rev Log: - refactoring Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=50487&r1=50486&r2=50487&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri Aug 29 15:55:06 2008 @@ -4349,18 +4349,17 @@ string Storage::getAllUsedFs() const - { - list<FsType> fs; +{ + set<FsType> fs; ConstVolPair p = volPair( Volume::notDeleted ); for( ConstVolIterator v=p.begin(); v!=p.end(); ++v ) { FsType t = v->getFs(); - if( t!=FSUNKNOWN && t!=FSNONE && - find( fs.begin(), fs.end(), t )==fs.end() ) - fs.push_back(t); + if (t!=FSUNKNOWN && t!=FSNONE) + fs.insert(t); } string ret; - for( list<FsType>::const_iterator i=fs.begin(); i!=fs.end(); ++i ) + for( set<FsType>::const_iterator i=fs.begin(); i!=fs.end(); ++i ) { if( !ret.empty() ) ret += ' '; @@ -4368,7 +4367,8 @@ } y2mil( "ret:" << ret ); return( ret ); - } +} + bool Storage::getFsCapabilities (FsType fstype, FsCapabilities& fscapabilities) const Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=50487&r1=50486&r2=50487&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Fri Aug 29 15:55:06 2008 @@ -6386,48 +6386,24 @@ return( ret ); } + global string GetUsedFs() { if (!InitLibstorage(false)) return nil; - string r = LibStorage::StorageInterface::getAllUsedFs( sint ); - list<string> lr = sort(splitstring(r," \t")); - r = mergestring( lr, " " ); - y2milestone( "GetUsedFs ret:%1", r ); - return( r ); + string r = LibStorage::StorageInterface::getAllUsedFs(sint); + y2milestone("GetUsedFs ret:%1", r); + return r; } -list FindUsedFsLine( map file ) - { - list ret = []; - list<list> t = maplist( integer k, map e, file["l"]:$[], - ``([k, e["line"]:""])); - t = filter( list e, t, ``(search(e[1]:"","USED_FS_LIST")==0)); - y2milestone( "FindUsedFsLine t:%1", t ); - ret = t[0]:[]; - y2milestone( "FindUsedFsLine ret:%1", ret ); - return( ret ); - } global void SaveUsedFs() - { - y2milestone( "SaveUsedFs" ); - string s = GetUsedFs(); - map file = $[]; - AsciiFile::ReadFile( file, "/etc/sysconfig/storage" ); - list l = FindUsedFsLine( file ); - string e = "USED_FS_LIST=\"" + s + "\""; - integer lineno = l[0]:(size(file["l"]:$[]) + 1); - if( size(l)==0 ) - file["l",lineno] = $[]; - if( file["l",lineno,"line"]:""!=e ) - { - file["l",lineno,"line"] = e; - file["l",lineno,"changed"] = true; - AsciiFile::RewriteFile( file, "/etc/sysconfig/storage" ); - } - } +{ + y2milestone("SaveUsedFs"); + SCR::Write(.sysconfig.storage.USED_FS_LIST, GetUsedFs()); +} + global boolean Storage::IsPersistent( map p ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org