Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2018-02-02 22:18:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Fri Feb 2 22:18:23 2018 rev:190 rq:571042 version:4.0.19 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2018-01-28 00:37:21.927276457 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2018-02-02 22:18:24.712716734 +0100 @@ -1,0 +2,13 @@ +Tue Jan 30 12:50:29 UTC 2018 - jreidin...@suse.com + +- Lnaguage: nicer handling of dbus timeout (bsc#1076804) +- 4.0.19 + +------------------------------------------------------------------- +Mon Jan 29 12:00:29 UTC 2018 - lsle...@suse.cz + +- Reimplemented package reset to require less memory + (related to bsc#1076768) +- 4.0.18 + +------------------------------------------------------------------- Old: ---- yast2-country-4.0.17.tar.bz2 New: ---- yast2-country-4.0.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.4phDCy/_old 2018-02-02 22:18:25.336687605 +0100 +++ /var/tmp/diff_new_pack.4phDCy/_new 2018-02-02 22:18:25.340687418 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.0.17 +Version: 4.0.19 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-4.0.17.tar.bz2 -> yast2-country-4.0.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.17/language/src/lib/y2country/language_dbus.rb new/yast2-country-4.0.19/language/src/lib/y2country/language_dbus.rb --- old/yast2-country-4.0.17/language/src/lib/y2country/language_dbus.rb 2018-01-24 16:38:12.000000000 +0100 +++ new/yast2-country-4.0.19/language/src/lib/y2country/language_dbus.rb 2018-01-30 13:55:59.000000000 +0100 @@ -44,18 +44,23 @@ return nil end localed_conf = {} - # https://www.freedesktop.org/wiki/Software/systemd/localed/ - sysbus = DBus.system_bus - locale_service = sysbus["org.freedesktop.locale1"] - locale_object = locale_service.object "/org/freedesktop/locale1" - # following line not necessary with ruby-dbus >= 0.13.0 - locale_object.introspect # needed, https://github.com/mvidner/ruby-dbus/issues/28 - locale_interface = locale_object["org.freedesktop.locale1"] - locales = locale_interface["Locale"] - locales[0].split(',').each do | locale | - parsed = locale.split('=', 2) - key = parsed[0] - localed_conf[key] = parsed[1] + begin + # https://www.freedesktop.org/wiki/Software/systemd/localed/ + sysbus = DBus.system_bus + locale_service = sysbus["org.freedesktop.locale1"] + locale_object = locale_service.object "/org/freedesktop/locale1" + # following line not necessary with ruby-dbus >= 0.13.0 + locale_object.introspect # needed, https://github.com/mvidner/ruby-dbus/issues/28 + locale_interface = locale_object["org.freedesktop.locale1"] + locales = locale_interface["Locale"] + locales[0].split(',').each do | locale | + parsed = locale.split('=', 2) + key = parsed[0] + localed_conf[key] = parsed[1] + end + rescue => e + log.error "Dbus reading failed with #{e.message}" + return nil end log.info("Locale settings read from system: #{localed_conf}") localed_conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.17/language/src/modules/Language.rb new/yast2-country-4.0.19/language/src/modules/Language.rb --- old/yast2-country-4.0.17/language/src/modules/Language.rb 2018-01-24 16:38:12.000000000 +0100 +++ new/yast2-country-4.0.19/language/src/modules/Language.rb 2018-01-30 13:55:59.000000000 +0100 @@ -977,21 +977,12 @@ Pkg.PkgSolve(true) - selected_packages = Pkg.ResolvableProperties("", :package, "") - - Builtins.y2milestone("Unselecting already recommended packages") - - # unselect them - Builtins.foreach(selected_packages) do |package| - if Ops.get_symbol(package, "status", :unknown) == :selected - Builtins.y2milestone( - "Unselecting package: %1", - Ops.get_string(package, "name", "") - ) - Pkg.PkgNeutral(Ops.get_string(package, "name", "")) - end - end + # package names only, without version + names_only = true + selected_packages = Pkg.GetPackages(:selected, names_only) + log.info("Unselecting already recommended packages: #{selected_packages.inspect}") + selected_packages.each { |p| Yast::Pkg.PkgNeutral(p) } @reset_recommended = false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.17/language/test/Language_test.rb new/yast2-country-4.0.19/language/test/Language_test.rb --- old/yast2-country-4.0.17/language/test/Language_test.rb 2018-01-24 16:38:12.000000000 +0100 +++ new/yast2-country-4.0.19/language/test/Language_test.rb 2018-01-30 13:55:59.000000000 +0100 @@ -194,4 +194,12 @@ end end end + describe "#ResetRecommendedPackages" do + it "resets the recommended packages" do + allow(Yast::Pkg).to receive(:PkgSolve) + expect(Yast::Pkg).to receive(:GetPackages).with(:selected, true).and_return(["foo"]) + expect(Yast::Pkg).to receive(:PkgNeutral).with("foo") + subject.ResetRecommendedPackages + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.17/package/yast2-country.changes new/yast2-country-4.0.19/package/yast2-country.changes --- old/yast2-country-4.0.17/package/yast2-country.changes 2018-01-24 16:38:12.000000000 +0100 +++ new/yast2-country-4.0.19/package/yast2-country.changes 2018-01-30 13:55:59.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Jan 30 12:50:29 UTC 2018 - jreidin...@suse.com + +- Lnaguage: nicer handling of dbus timeout (bsc#1076804) +- 4.0.19 + +------------------------------------------------------------------- +Mon Jan 29 12:00:29 UTC 2018 - lsle...@suse.cz + +- Reimplemented package reset to require less memory + (related to bsc#1076768) +- 4.0.18 + +------------------------------------------------------------------- Wed Jan 24 13:39:34 UTC 2018 - igonzalezs...@suse.com - Unify openSUSE and SLE console fonts maps (bsc#1068814). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.17/package/yast2-country.spec new/yast2-country-4.0.19/package/yast2-country.spec --- old/yast2-country-4.0.17/package/yast2-country.spec 2018-01-24 16:38:12.000000000 +0100 +++ new/yast2-country-4.0.19/package/yast2-country.spec 2018-01-30 13:55:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.0.17 +Version: 4.0.19 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build