Author: fehr Date: Mon Sep 10 19:15:39 2007 New Revision: 40839 URL: http://svn.opensuse.org/viewcvs/yast?rev=40839&view=rev Log: be more robust if /proc/swaps in invalid (#309050) Modified: trunk/storage/libstorage/src/ProcMounts.cc trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/libstorage/src/ProcMounts.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMounts.cc?rev=40839&r1=40838&r2=40839&view=diff ============================================================================== --- trunk/storage/libstorage/src/ProcMounts.cc (original) +++ trunk/storage/libstorage/src/ProcMounts.cc Mon Sep 10 19:15:39 2007 @@ -104,6 +104,7 @@ mounts.clear(); mounts.open( "/proc/swaps" ); getline( mounts, line ); + y2mil( "line:\"" << line << "\"" ); getline( mounts, line ); while( mounts.good() ) { Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=40839&r1=40838&r2=40839&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Sep 10 19:15:39 2007 @@ -1,8 +1,9 @@ ------------------------------------------------------------------- -Mon Sep 10 12:45:37 CEST 2007 - fehr@suse.de +Mon Sep 10 19:15:08 CEST 2007 - fehr@suse.de - do not autodetect NFS mount in instsys (#308618) - change windows detection to cover also Vista (#307802) +- be more robust if /proc/swaps in invalid (#309050) ------------------------------------------------------------------- Thu Sep 6 15:40:49 CEST 2007 - fehr@suse.de Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=40839&r1=40838&r2=40839&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Sep 10 19:15:39 2007 @@ -690,6 +690,8 @@ SCR::UnmountAgent (.proc.swaps); list<map> swaps = filter(map e, (list<map>) SCR::Read( .proc.swaps ), ``(e["type"]:""=="partition")); + if( swaps==nil ) + swaps = []; ret = maplist(map e, swaps, ``(Partitions::TranslateMapperName(e["file"]:"")) ); y2milestone( "SwappingPartitions %1", ret ); return( ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org