Author: ug Date: Mon Jul 25 10:36:49 2011 New Revision: 64975 URL: http://svn.opensuse.org/viewcvs/yast?rev=64975&view=rev Log: speed up partition calculation (bnc#620212) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/include/autopart.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes?rev=64975&r1=64974&r2=64975&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Mon Jul 25 10:36:49 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 25 10:30:56 CEST 2011 - ug@suse.de + +- speed up partition calculation when a lot partitions are + reused (bnc#620212) + +------------------------------------------------------------------- Mon Jul 25 10:06:25 CEST 2011 - ug@suse.de - notification option for scripts added (fate#312674) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/include/autopart.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/include/autopart.ycp?rev=64975&r1=64974&r2=64975&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/include/autopart.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/include/autopart.ycp Mon Jul 25 10:36:49 2011 @@ -903,7 +903,16 @@ ``{ y2milestone( "start: gap section %1", e ); - if( part["max_cyl"]:0 <= e["end"]:0 && + // speed up partitioning calculation (bnc#620212) + boolean reuseCondition = true; + if( part["create"]:true == false && + (( haskey( part, "partition_nr" ) && part["partition_nr"]:0 != e["nr"]:0 )) ) { + y2milestone("gap can't be used. %1 != %2", part["partition_nr"]:0, e["nr"]:0 ); + reuseCondition = false; + } + + if( reuseCondition && + part["max_cyl"]:0 <= e["end"]:0 && part["cylinders"]:0 <= e["cylinders"]:0 && (!e["extended"]:false && (size(lg["free_pnr"]:[])>0 || ! creation_needed ) || e["extended"]:false && size(lg["ext_pnr"]:[])>0) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org