Author: lslezak Date: Wed Nov 3 22:05:38 2010 New Revision: 62751 URL: http://svn.opensuse.org/viewcvs/yast?rev=62751&view=rev Log: - don't reset package selection in the installation proposal when partitioning is changed (bnc#450786, bnc#371875) Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes?rev=62751&r1=62750&r2=62751&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes Wed Nov 3 22:05:38 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 3 20:22:47 UTC 2010 - lslezak@suse.cz + +- don't reset package selection in the installation proposal when + partitioning is changed (bnc#450786, bnc#371875) + +------------------------------------------------------------------- Wed Nov 3 13:44:55 UTC 2010 - lslezak@suse.cz - don't reset package selection in dirinstall mode when target Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp?rev=62751&r1=62750&r2=62751&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/clients/software_proposal.ycp Wed Nov 3 22:05:38 2010 @@ -69,7 +69,14 @@ add (Pkg::GetAdditionalLocales (), Language::language)); } - if ( language_changed || partition_changed ) + // if only partitioning has been changed just return the current state, + // don't reset to default (bnc#450786, bnc#371875) + if (partition_changed && !language_changed && !force_reset) + { + return Packages::Summary ([ `product, `pattern, `selection, `size, `desktop ], false); + } + + if ( language_changed ) { reinit = true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org