Author: lslezak Date: Thu Oct 6 14:12:25 2011 New Revision: 66286 URL: http://svn.opensuse.org/viewcvs/yast?rev=66286&view=rev Log: - skip product selection in the second stage (do not reinstall the product package during autoinstallation) (bnc#721166) - 2.17.93 Modified: branches/SuSE-Code-11-SP2-Branch/packager/VERSION 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/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/VERSION?rev=66286&r1=66285&r2=66286&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/VERSION Thu Oct 6 14:12:25 2011 @@ -1 +1 @@ -2.17.92 +2.17.93 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=66286&r1=66285&r2=66286&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 Thu Oct 6 14:12:25 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 6 11:52:02 UTC 2011 - lslezak@suse.cz + +- skip product selection in the second stage (do not reinstall + the product package during autoinstallation) (bnc#721166) +- 2.17.93 + +------------------------------------------------------------------- Thu Sep 8 09:12:40 UTC 2011 - lslezak@suse.cz - read biosdevname option directly from /proc/cmdline (bnc#712049) 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=66286&r1=66285&r2=66286&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 Thu Oct 6 14:12:25 2011 @@ -1703,6 +1703,13 @@ */ global boolean SelectProduct () { Packages::Initialize (true); + + if (Stage::cont()) + { + y2milestone("Second stage - skipping product selection"); + return true; + } + list<map<string,any> > products = Pkg::ResolvableProperties ("", `product, ""); if (size (products) == 0) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org