Author: locilka Date: Thu May 14 13:51:35 2009 New Revision: 57175 URL: http://svn.opensuse.org/viewcvs/yast?rev=57175&view=rev Log: - Installation/Upgrade newly require some packages essential for them to succeed (bnc #469730). Modified: branches/tmp/SLE-11-SP1-Stash/installation/package/yast2-installation.changes branches/tmp/SLE-11-SP1-Stash/installation/src/clients/inst_mode.ycp Modified: branches/tmp/SLE-11-SP1-Stash/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/installation/package/yast2-installation.changes?rev=57175&r1=57174&r2=57175&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/installation/package/yast2-installation.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/installation/package/yast2-installation.changes Thu May 14 13:51:35 2009 @@ -3,6 +3,8 @@ - Fixed Vendor module to use zypp history file instead of using y2logRPM (bnc #456446). +- Installation/Upgrade newly require some packages essential for + them to succeed (bnc #469730). ------------------------------------------------------------------- Tue Apr 7 13:04:20 CEST 2009 - ug@suse.de Modified: branches/tmp/SLE-11-SP1-Stash/installation/src/clients/inst_mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/installation/src/clients/inst_mode.ycp?rev=57175&r1=57174&r2=57175&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/installation/src/clients/inst_mode.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/installation/src/clients/inst_mode.ycp Thu May 14 13:51:35 2009 @@ -450,6 +450,17 @@ ); Wizard::SetTitleIcon ("yast-software"); +// BNC #469730: Installation requires some packages +void SetRequiredPackages () { + if (new_mode == `install) { + y2milestone ("Adding packages required for installation to succeed..."); + PackagesProposal::AddResolvables ("YaST-Installation", `package, ["yast2-installation"]); + } else if (new_mode == `update) { + y2milestone ("Adding packages required for update to succeed..."); + PackagesProposal::AddResolvables ("YaST-Update", `package, ["yast2-update"]); + } +} + if (Mode::mode () != InstData::start_mode) { y2milestone ("Switching Steps from %1 to %2 ", InstData::start_mode, Mode::mode ()); UpdateWizardSteps (); @@ -460,8 +471,11 @@ Kernel::ProbeKernel(); Pkg::TargetFinish (); Pkg::PkgReset (); + // Resets all resolvables required by installation/update parts + // Particular modules will add them again when needed PackagesProposal::ResetAll(); Packages::Init( true ); + SetRequiredPackages (); ret = ProductControl::RunFrom (ProductControl::CurrentStep () + 1, false); @@ -469,6 +483,7 @@ ret = `finish; } else { UpdateWizardSteps (); + SetRequiredPackages (); ret = ProductControl::RunFrom (ProductControl::CurrentStep () + 1, false); if (ret == `next) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org