[yast-commit] r66793 - in /trunk/country: VERSION language/data/language_nl_NL.ycp language/src/modules/Language.ycp package/yast2-country.changes

Author: jsuchome Date: Mon Nov 14 13:58:47 2011 New Revision: 66793 URL: http://svn.opensuse.org/viewcvs/yast?rev=66793&view=rev Log: - force installing recommended language packages (bnc#722739) - use "us" keyboard layout for Dutch (bnc#728547) - 2.21.6 Modified: trunk/country/VERSION trunk/country/language/data/language_nl_NL.ycp trunk/country/language/src/modules/Language.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=66793&r1=66792&r2=66793&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Mon Nov 14 13:58:47 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/country/language/data/language_nl_NL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/data/language_nl_NL.ycp?rev=66793&r1=66792&r2=66793&view=diff ============================================================================== --- trunk/country/language/data/language_nl_NL.ycp (original) +++ trunk/country/language/data/language_nl_NL.ycp Mon Nov 14 13:58:47 2011 @@ -38,6 +38,6 @@ // 2. what time zone propose for this language "timezone" : "Europe/Amsterdam", // 3. which keyboard layout propose for this language - "keyboard" : "dutch", + "keyboard" : "english-us", ]; } Modified: trunk/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Language.ycp?rev=66793&r1=66792&r2=66793&view=diff ============================================================================== --- trunk/country/language/src/modules/Language.ycp (original) +++ trunk/country/language/src/modules/Language.ycp Mon Nov 14 13:58:47 2011 @@ -900,7 +900,7 @@ // no language package would be installed // // do this just once at the beginning -void ResetRecommendedPackaged() +void ResetRecommendedPackages() { if (!reset_recommended) { @@ -937,12 +937,19 @@ PackageSystem::EnsureSourceInit (); PackageSystem::EnsureTargetInit (); - ResetRecommendedPackaged(); + map solver_flags_backup = Pkg::GetSolverFlags (); + // first, do not ignore recommended (= also language) packages + Pkg::SetSolverFlags ($[ "ignoreAlreadyRecommended" : false ]); + // ... but skip non-language recommended packages + ResetRecommendedPackages(); Pkg::SetAdditionalLocales (selected_languages); + // now, add only recommended language packages (other recommended are PkgNeutral-ized) boolean solved = Pkg::PkgSolve (true); + Pkg::SetSolverFlags (solver_flags_backup); + return solved; } Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=66793&r1=66792&r2=66793&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Mon Nov 14 13:58:47 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 14 12:15:40 CET 2011 - jsuchome@suse.cz + +- force installing recommended language packages (bnc#722739) +- use "us" keyboard layout for Dutch (bnc#728547) +- 2.21.6 + +------------------------------------------------------------------- Wed Sep 21 12:19:29 CEST 2011 - jsuchome@suse.cz - use better cyrillic font for relevant languages (bnc#713332) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org