Author: fehr Date: Tue Feb 26 16:08:02 2008 New Revision: 45030 URL: http://svn.opensuse.org/viewcvs/yast?rev=45030&view=rev Log: fix problem when reusing existing partition (#267212) Modified: branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-SLE-10-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes?rev=45030&r1=45029&r2=45030&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes Tue Feb 26 16:08:02 2008 @@ -2,6 +2,7 @@ Tue Feb 26 13:14:01 CET 2008 - fehr@suse.de - allow setting of mountBy to `device (bnc#364793) +- fix problem when reusing existing partition (#267212) - version 2.13.100 ------------------------------------------------------------------- Modified: branches/SuSE-SLE-10-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp?rev=45030&r1=45029&r2=45030&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp Tue Feb 26 16:08:02 2008 @@ -1199,11 +1199,15 @@ addl = add( addl, llg["ext_pnr",0]:5 ); llg["ext_pnr"] = remove( llg["ext_pnr"]:[0], 0 ); } - else + else if( !e["exists"]:false ) { addl = add( addl, llg["free_pnr",0]:1 ); llg["free_pnr"] = remove( llg["free_pnr"]:[0], 0 ); } + else + { + addl = add( addl, e["nr"]:0 ); + } llg["gap",gindex,"added"] = add( llg["gap",gindex,"added"]:[], addl ); if( pindex+1 < size(ps) ) @@ -2774,6 +2778,8 @@ disk["partitions"] = p; map r = can_swap_reuse( s, disk["partitions"]:[], target ); boolean have_swap = size(r)>0; + y2milestone( "get_inst_proposal have_boot %1 have_swap %2", + have_boot, have_swap ); if( haskey( r, "partitions" )) disk["partitions"] = r["partitions"]:[]; else if( haskey( r, "targets" )) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org