Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2016-08-25 09:52:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2016-08-18 10:18:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2016-08-25 09:52:44.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 19 14:47:20 CEST 2016 - loci...@suse.com + +- Fixed downloading language extensions in the installation + (bsc#994577) +- 3.1.30 + +------------------------------------------------------------------- Old: ---- yast2-country-3.1.29.tar.bz2 New: ---- yast2-country-3.1.30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.B1fH5z/_old 2016-08-25 09:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.B1fH5z/_new 2016-08-25 09:52:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.29 +Version: 3.1.30 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-3.1.29.tar.bz2 -> yast2-country-3.1.30.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.29/CONTRIBUTING.md new/yast2-country-3.1.30/CONTRIBUTING.md --- old/yast2-country-3.1.29/CONTRIBUTING.md 2016-08-10 16:53:54.000000000 +0200 +++ new/yast2-country-3.1.30/CONTRIBUTING.md 2016-08-19 15:55:17.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.29/language/src/modules/Language.rb new/yast2-country-3.1.30/language/src/modules/Language.rb --- old/yast2-country-3.1.29/language/src/modules/Language.rb 2016-08-10 16:53:54.000000000 +0200 +++ new/yast2-country-3.1.30/language/src/modules/Language.rb 2016-08-19 15:55:17.000000000 +0200 @@ -464,7 +464,7 @@ lang = correct_language(lang) if Stage.initial && !Mode.test && !Mode.live_installation - integrate_inst_sys_extension(@language) + integrate_inst_sys_extension(lang) end GetLocales() if Builtins.size(@locales) == 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.29/language/test/Language_test.rb new/yast2-country-3.1.30/language/test/Language_test.rb --- old/yast2-country-3.1.29/language/test/Language_test.rb 2016-08-10 16:53:54.000000000 +0200 +++ new/yast2-country-3.1.30/language/test/Language_test.rb 2016-08-19 15:55:17.000000000 +0200 @@ -15,6 +15,13 @@ "@euro", "German" ], + "de_ZU" => [ + "Zulu Deutsch", + "Zulu Deutsch", + ".UTF-8", + ".deZU", + "Zulu German" + ], "pt_BR" => [ "Português brasileiro", "Portugues brasileiro", @@ -43,7 +50,9 @@ it "shows UI feedback and extends the inst-sys for selected language" do allow(Yast::Popup).to receive(:ShowFeedback) allow(Yast::Popup).to receive(:ClearFeedback) - expect(Yast::InstExtensionImage).to receive(:DownloadAndIntegrateExtension).with(/yast2-trans-.*/).and_return(true) + # There are two or more de_* languages available, so it uses the full language ID + # instead of using only "de" + expect(Yast::InstExtensionImage).to receive(:DownloadAndIntegrateExtension).with(/yast2-trans-#{new_language}.*/).and_return(true) subject.integrate_inst_sys_extension(new_language) end end @@ -106,7 +115,7 @@ it "sets the new language, encoding integrates inst-sys extension and adapts install.inf" do allow(Yast::Stage).to receive(:initial).and_return(true) allow(Yast::Mode).to receive(:mode).and_return("installation") - expect(subject).to receive(:integrate_inst_sys_extension).and_return(nil) + expect(subject).to receive(:integrate_inst_sys_extension).with(new_language).and_return(nil) expect(subject).to receive(:adapt_install_inf).and_return(true) subject.Set(new_language) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.29/package/yast2-country.changes new/yast2-country-3.1.30/package/yast2-country.changes --- old/yast2-country-3.1.29/package/yast2-country.changes 2016-08-10 16:53:54.000000000 +0200 +++ new/yast2-country-3.1.30/package/yast2-country.changes 2016-08-19 15:55:17.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 19 14:47:20 CEST 2016 - loci...@suse.com + +- Fixed downloading language extensions in the installation + (bsc#994577) +- 3.1.30 + +------------------------------------------------------------------- Wed Aug 10 14:27:49 CEST 2016 - loci...@suse.com - Added check for correct <language /> coming from an AutoYast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.29/package/yast2-country.spec new/yast2-country-3.1.30/package/yast2-country.spec --- old/yast2-country-3.1.29/package/yast2-country.spec 2016-08-10 16:53:54.000000000 +0200 +++ new/yast2-country-3.1.30/package/yast2-country.spec 2016-08-19 15:55:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.29 +Version: 3.1.30 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build