Author: fehr Date: Thu Nov 17 15:45:46 2011 New Revision: 66863 URL: http://svn.opensuse.org/viewcvs/yast?rev=66863&view=rev Log: fix proposal for some cases where exactly 1 partition selected Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/auto_part_create.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes?rev=66863&r1=66862&r2=66863&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu Nov 17 15:45:46 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Nov 17 15:44:52 CET 2011 - fehr@suse.de + +- fix proposal for some cases where exactly 1 partition selected + +------------------------------------------------------------------- Wed Nov 09 12:29:53 CET 2011 - aschnell@suse.de - avoid detection on volumes on disk used by other stuff (bnc#729155) Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/auto_part_create.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/auto_part_create.ycp?rev=66863&r1=66862&r2=66863&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/auto_part_create.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/auto_part_create.ycp Thu Nov 17 15:45:46 2011 @@ -63,7 +63,10 @@ y2milestone( "create_partitions num_del_exist %1 num_del_free %2 swap_reuse %3", num_del_exist, num_del_free, size(r)>0 ); y2milestone( "create_partitions keep %1", keep ); - if( keep!=nil && size(r)>0 && num_del_exist==1 && num_del_free==0 ) + if( keep!=nil && size(r)>0 && + !StorageProposal::GetProposalHome() && + !StorageProposal::GetProposalBtrfs() && + num_del_exist==1 && num_del_free==0 ) { y2milestone( "create_partitions single special" ); boolean first = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org