Author: locilka Date: Thu May 29 14:59:41 2008 New Revision: 47938 URL: http://svn.opensuse.org/viewcvs/yast?rev=47938&view=rev Log: - Selecting packages for deletion after PkgApplReset call instead of calling it before (bnc #391785). - 2.16.10 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/clients/update_proposal.ycp trunk/update/src/modules/Update.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=47938&r1=47937... ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Thu May 29 14:59:41 2008 @@ -1 +1 @@ -2.16.9 +2.16.10 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chang... ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Thu May 29 14:59:41 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu May 29 14:56:15 CEST 2008 - locilka@suse.cz + +- Selecting packages for deletion after PkgApplReset call instead + of calling it before (bnc #391785). +- 2.16.10 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz - added categories Settings and System into desktop file Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_proposa... ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Thu May 29 14:59:41 2008 @@ -267,7 +267,14 @@ foreach (map<string,any> s, selected, { restore = add (restore, s["name"]:""); }); + Pkg::PkgApplReset (); + + // bnc #300540 + // bnc #391785 + // Drops packages after PkgApplReset, not before (that would null that) + Update::DropObsoletePackages(); + foreach (string res, restore, { Pkg::ResolvableInstall (res, `product); }); Modified: trunk/update/src/modules/Update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/Update.ycp?rev... ============================================================================== --- trunk/update/src/modules/Update.ycp (original) +++ trunk/update/src/modules/Update.ycp Thu May 29 14:59:41 2008 @@ -363,7 +363,7 @@ * * @see bnc #300540 */ - void DropObsoletePackages () { + global void DropObsoletePackages () { string packages_to_drop = ProductFeatures::GetStringFeature ("software", "dropped_packages"); if (packages_to_drop == nil || packages_to_drop == "") { @@ -391,9 +391,6 @@ Update::InitUpdate(); - // bnc #300540 - DropObsoletePackages(); - // deleteOldPackages = DeleteOldPackages(); // y2milestone ("deleteOldPackages %1", deleteOldPackages); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org