From 6bc5777256c1a39e871256c547bfeb8f6a746052 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Thu, 19 Jan 2017 21:23:45 +0100 Subject: [PATCH 1/2] Set default language before proposing. bnc#1017752 --- src/lib/installation/proposal_runner.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/installation/proposal_runner.rb b/src/lib/installation/proposal_runner.rb index bdc97925d..3e8331b8d 100644 --- a/src/lib/installation/proposal_runner.rb +++ b/src/lib/installation/proposal_runner.rb @@ -102,6 +102,12 @@ def run return :auto if !submod_descriptions_and_build_menu + # Default language is the most often set by language proposal later in the workflow + # and overwrites this. + # However, some products do not contain such proposal (e.g. CaaSP) and needs this + # setup to avoid false language change detection (e.g. in software proposal) + Yast::Pkg.SetPackageLocale(Yast::Language.language) + # # Make the initial proposal # From 7c57ca5fb53438edeb37009e6b0795d4f9c77139 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Fri, 20 Jan 2017 09:47:25 +0100 Subject: [PATCH 2/2] Updated changelog --- package/yast2-installation.changes | 8 ++++++++ package/yast2-installation.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 1df83c72e..fd88531a7 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 20 08:44:28 UTC 2017 - mfilka@suse.com + +- bnc#1017752 + - do not show language change warning in software proposal + incorrectly when language was not changed. +- 3.1.217.12 + ------------------------------------------------------------------- Tue Jan 17 15:34:22 UTC 2017 - igonzalezsosa@suse.com diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index 78b7ee8c2..5ecac63a1 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.217.11 +Version: 3.1.217.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build