Author: lslezak Date: Wed Nov 3 14:46:56 2010 New Revision: 62730 URL: http://svn.opensuse.org/viewcvs/yast?rev=62730&view=rev Log: - don't reset package selection in dirinstall mode when target directory is changed (bnc#568511, bnc#568512) Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.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=62730&r1=62729&r2=62730&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 14:46:56 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 3 13:44:55 UTC 2010 - lslezak@suse.cz + +- don't reset package selection in dirinstall mode when target + directory is changed (bnc#568511, bnc#568512) + +------------------------------------------------------------------- Wed Oct 27 10:14:52 CEST 2010 - mzugec@suse.cz - backported layout change for repository (bnc#510794) Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp?rev=62730&r1=62729&r2=62730&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/Packages.ycp Wed Nov 3 14:46:56 2010 @@ -1804,6 +1804,14 @@ y2milestone("the cached proposal is empty or reset is required"); } + if (Installation::dirinstall_installing_into_dir && !force_reset && init_called) + { + return Summary ( + [ `product, `pattern, `selection, `size, `desktop ], + false + ); + } + UI::OpenDialog(`opt(`decorated ), // popup label `Label (_("Evaluating package selection..."))); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org