Author: fehr Date: Mon Oct 17 13:02:31 2011 New Revision: 66466 URL: http://svn.opensuse.org/viewcvs/yast?rev=66466&view=rev Log: show popup when user rquirements are too small for having a separate /home (bnc#721664) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/inst_disk_proposal.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=66466&r1=66465&r2=66466&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Oct 17 13:02:31 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 17 13:00:49 CEST 2011 - fehr@suse.de + +- show popup when user rquirements are too small for having a + separate /home (bnc#721664) + +------------------------------------------------------------------- Mon Oct 10 15:05:41 CEST 2011 - aschnell@suse.de - disable call of smartctl for certain RAIDs (bnc#720956) Modified: trunk/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk_proposal.ycp?rev=66466&r1=66465&r2=66466&view=diff ============================================================================== --- trunk/storage/storage/src/inst_disk_proposal.ycp (original) +++ trunk/storage/storage/src/inst_disk_proposal.ycp Mon Oct 17 13:02:31 2011 @@ -37,6 +37,24 @@ include "partitioning/custom_part_dialogs.ycp"; include "partitioning/ep-import.ycp"; +boolean CouldNotDoSeparateHome( map prop ) + { + boolean ret = false; + if( StorageProposal::GetProposalHome() ) + { + list<map> ls = []; + foreach( string k, map d, prop, + ``{ + ls = (list<map>)union( ls, filter( map p, d["partitions"]:[], + ``(!p["delete"]:false&&size(p["mount"]:"")>0) )); + }); + ret = size(filter( map p, ls, ``(p["mount"]:""=="/home")))==0; + y2milestone( "CouldNotDoSeparateHome ls:%1", ls ); + } + y2milestone( "CouldNotDoSeparateHome ret:%1", ret ); + return( ret ); + } + boolean AskOverwriteChanges() { @@ -149,8 +167,15 @@ { map prop = StorageProposal::get_inst_prop(Storage::GetTargetMap()); y2milestone( "prop ok:%1", prop["ok"]:false ); + SCR::Write(.target.ycp, "/tmp/prop_first", prop ); + if( prop["ok"]:false ) { + if( CouldNotDoSeparateHome( prop["target"]:$[] )) + { + StorageProposal::SetProposalHome(false); + UI::ChangeWidget(`id(`home), `Value, false); + } Storage::SetTargetMap( prop["target"]:$[] ); targetMap = prop["target"]:$[]; Storage::SetPartProposalMode( "accept" ); @@ -294,6 +319,13 @@ } else { + if( CouldNotDoSeparateHome( prop["target"]:$[] )) + { + string reason = _("Not enough space available to propose separate /home."); + Popup::Error( reason ); + StorageProposal::SetProposalHome(false); + UI::ChangeWidget(`id(`home), `Value, false); + } targetMap = prop["target"]:$[]; Storage::SetPartProposalMode( "accept" ); Storage::SetPartProposalActive( true ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org