Author: aschnell Date: Mon Jan 11 19:04:30 2010 New Revision: 60323 URL: http://svn.opensuse.org/viewcvs/yast?rev=60323&view=rev Log: - use getenv instead of echo - make elements of no_propose_disks unique Modified: trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageProposal.ycp?rev=60323&r1=60322&r2=60323&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Mon Jan 11 19:04:30 2010 @@ -277,11 +277,15 @@ } if( Stage::initial() ) { - map ret = (map)SCR::Execute( .target.bash_output, "echo $YAST2_STORAGE_NO_PROPOSE_DISKS" ); - y2milestone( "NoProposeDisks ret \"%1\"", ret["stdout"]:"" ); - list ls = filter( string e, splitstring( ret["stdout"]:"", " \t\n" ), ``(size(e)>0) ); - no_propose_disks = (list<string>)merge( no_propose_disks, ls ); + string env = getenv("YAST2_STORAGE_NO_PROPOSE_DISKS"); + y2milestone( "NoProposeDisks env:\"%1\"", env ); + if (env != nil) + { + list<string> ls = filter( string e, splitstring( env, " \t\n" ), ``(size(e)>0) ); + no_propose_disks = (list<string>)merge( no_propose_disks, ls ); + } } + no_propose_disks = toset(sort(no_propose_disks)); y2milestone( "NoProposeDisks \"%1\"", no_propose_disks ); } return no_propose_disks; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org