Author: jsuchome Date: Thu Jun 30 14:44:45 2011 New Revision: 64658 URL: http://svn.opensuse.org/viewcvs/yast?rev=64658&view=rev Log: - allow upgrade without FLAGS defined in content file (bnc#702634) - fixed typos (bnc#703119) - 2.17.85 Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp branches/SuSE-Code-11-SP2-Branch/installation/src/clients/save_config_finish.ycp Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/VERSION?rev=64658&r1=64657&r2=64658&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Thu Jun 30 14:44:45 2011 @@ -1 +1 @@ -2.17.84 +2.17.85 Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes?rev=64658&r1=64657&r2=64658&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Thu Jun 30 14:44:45 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 30 14:09:52 CEST 2011 - jsuchome@suse.cz + +- allow upgrade without FLAGS defined in content file (bnc#702634) +- fixed typos (bnc#703119) +- 2.17.85 + +------------------------------------------------------------------- Fri Jun 17 10:22:24 CEST 2011 - jsuchome@suse.cz - check the product profiles during system analysis and Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp?rev=64658&r1=64657&r2=64658&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp Thu Jun 30 14:44:45 2011 @@ -139,8 +139,13 @@ boolean EvaluateUpdatePossibilities () { y2milestone ("Product flags: %1", Product::flags); - if (contains (Product::flags, "update") || Kernel::GetSuSEUpdate ()) { + if (Product::flags == nil || size (Product::flags) == 0) { + y2milestone ("No product flags defined, assuming update is possible"); InstData::offer_update = true; + } else if (contains (Product::flags, "update") || Kernel::GetSuSEUpdate ()) { + InstData::offer_update = true; + } else { + InstData::offer_update = false; } return true; Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/src/clients/save_config_finish.ycp?rev=64658&r1=64657&r2=64658&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/save_config_finish.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/save_config_finish.ycp Thu Jun 30 14:44:45 2011 @@ -126,7 +126,7 @@ { Progress::NextStep (); // progress step title - Progress::Title (_("Saving automatical installation settings...")); + Progress::Title (_("Saving automatic installation settings...")); AutoInstall::Save(); } Progress::NextStep (); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org