Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2020-12-18 19:52:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Fri Dec 18 19:52:11 2020 rev:218 rq:856315 version:4.3.11 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2020-10-18 16:24:03.020561033 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new.5145/yast2-country.changes 2020-12-18 19:52:12.705601555 +0100 @@ -1,0 +2,6 @@ +Tue Dec 15 14:49:46 UTC 2020 - Stefan Schubert <sch...@suse.de> + +- Removed old code for sysvinit configuration (bsc#1175494). +- 4.3.11 + +------------------------------------------------------------------- Old: ---- yast2-country-4.3.10.tar.bz2 New: ---- yast2-country-4.3.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.emcub7/_old 2020-12-18 19:52:13.157602053 +0100 +++ /var/tmp/diff_new_pack.emcub7/_new 2020-12-18 19:52:13.161602058 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.3.10 +Version: 4.3.11 Release: 0 Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone) License: GPL-2.0-only ++++++ yast2-country-4.3.10.tar.bz2 -> yast2-country-4.3.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/.coveralls.yml new/yast2-country-4.3.11/.coveralls.yml --- old/yast2-country-4.3.10/.coveralls.yml 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/.coveralls.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -service_name: travis-ci diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/.github/workflows/ci.yml new/yast2-country-4.3.11/.github/workflows/ci.yml --- old/yast2-country-4.3.10/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-4.3.11/.github/workflows/ci.yml 2020-12-16 09:35:35.000000000 +0100 @@ -0,0 +1,87 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions + +name: CI + +on: [push, pull_request] + +jobs: + Tests: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + # just for easier debugging... + - name: Inspect Installed Packages + run: rpm -qa | sort + + - name: Unit Tests + run: rake test:unit + # enable code coverage reporting + env: + COVERAGE: 1 + + # send the coverage report to coveralls.io + - name: Coveralls Report + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + + # FIXME: Rubocop not used + # Rubocop: + # runs-on: ubuntu-latest + # container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + # steps: + + # - name: Git Checkout + # uses: actions/checkout@v2 + + # - name: Rubocop + # run: rake check:rubocop + + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Package Build + run: yast-ci-ruby -o package + + Yardoc: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Yardoc + # FIXME: fix the yardoc warnings and then use "rake check:doc" here + run: yardoc + + # downloading the Docker image takes some time so bundling several fast + # checks into one job avoids that overhead + Checks: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Perl Syntax + run: yast-ci-ruby -o perl_syntax + + - name: POT Check + run: rake check:pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/.travis.yml new/yast2-country-4.3.11/.travis.yml --- old/yast2-country-4.3.10/.travis.yml 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-country-image . - # list the installed packages (just for easier debugging) - - docker run --rm -it yast-country-image rpm -qa | sort - -script: - # the "yast-travis-ruby" script is included in the base yastdevel/ruby image - # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - - docker run -it -e TRAVIS=1 --privileged -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-country-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/Dockerfile new/yast2-country-4.3.11/Dockerfile --- old/yast2-country-4.3.10/Dockerfile 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest -COPY . /usr/src/app - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/README.markdown new/yast2-country-4.3.11/README.markdown --- old/yast2-country-4.3.10/README.markdown 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/README.markdown 2020-12-16 09:35:35.000000000 +0100 @@ -1,7 +1,9 @@ # YaST - The Basic Libraries # -[](https://travis-ci.org/yast/yast-country) -[](https://ci.opensuse.org/view/Yast/job/yast-country-master/) +[]( +https://github.com/yast/yast-country/actions?query=branch%3Amaster) +[]( +https://ci.opensuse.org/view/Yast/job/yast-yast-country-master/) [](https://coveralls.io/r/yast/yast-country) Country specific data and configuration modules (language, keyboard, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/console/src/modules/Console.rb new/yast2-country-4.3.11/console/src/modules/Console.rb --- old/yast2-country-4.3.10/console/src/modules/Console.rb 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/console/src/modules/Console.rb 2020-12-16 09:35:35.000000000 +0100 @@ -70,8 +70,7 @@ @screenMap = "" @magic = "(B" - # non-empty if serial console (written /etc/inittab) - # -> S0:12345:respawn:/sbin/agetty -L 9600<n8> ttyS0 + # non-empty if serial console # something like "ttyS0,9600" from /etc/install.inf @serial = "" @@ -150,33 +149,7 @@ SCR.Write(path(".sysconfig.console"), nil) if @serial != "" - # during a fresh install, provide the autoconsole feature - # it detects wether the kernel console is VGA/framebuffer or serial - # it also starts agetty with the correct speed (#41623) - # fresh install, all is easy: just add the getty to /dev/console - # upgrade: disable old entries for serial console - SCR.Execute( - path(".target.bash"), - "/usr/bin/sed -i '/^\\(hvc\\|hvsi\\|S[0-9]\\)/s@^.*@#&@' /etc/inittab" - ) - - # find out if the baud rate is not present on command line (bnc#602743) - rate = 42 - Builtins.foreach(Builtins.splitstring(Kernel.GetCmdLine, "\t ")) do |part| - if Builtins.substring(part, 0, 11) == "console=tty" && - Builtins.issubstring(part, ",") - srate = Ops.get(Builtins.splitstring(part, ","), 1, "42") - rate = Builtins.tointeger(srate) # "bbbbpnf" -> bbbb, where 'b' is number and 'p' character - end - end - rate = 42 if rate == nil - SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/usr/bin/grep -E '^cons:' /etc/inittab || /usr/bin/echo 'cons:12345:respawn:/sbin/smart_agetty -L %1 console' >> /etc/inittab", - rate - ) - ) + # Root can login via console. See securetty(5) SCR.Execute( path(".target.bash"), "/usr/bin/grep -Ew ^console /etc/securetty || /usr/bin/echo console >> /etc/securetty" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/console/test/console_test.rb new/yast2-country-4.3.11/console/test/console_test.rb --- old/yast2-country-4.3.10/console/test/console_test.rb 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/console/test/console_test.rb 2020-12-16 09:35:35.000000000 +0100 @@ -36,7 +36,7 @@ context "when no console font is available" do it "does not set the console font" do - expect(Yast::UI).to_not receive(:SetConsole) + expect(Yast::UI).to_not receive(:SetConsoleFont) Yast::Console.SelectFont("martian") end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/language/test/Language_test.rb new/yast2-country-4.3.11/language/test/Language_test.rb --- old/yast2-country-4.3.10/language/test/Language_test.rb 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/language/test/Language_test.rb 2020-12-16 09:35:35.000000000 +0100 @@ -44,7 +44,6 @@ before do allow(Y2Country).to receive(:read_locale_conf).and_return(nil) - allow(subject).to receive(:languages_map).and_return(languages_map) allow(subject).to receive(:GetLanguagesMap).and_return(languages_map) Yast::Language.main @@ -209,8 +208,11 @@ end context "when LC_MESSAGES is zh_TW" do - before do - allow(subject).to receive(:@localed_conf).and_return({ "LC_MESSAGES" => "zh_TW" }) + around do |example| + original = subject.instance_variable_get(:@localed_conf) + subject.instance_variable_set(:@localed_conf, { "LC_MESSAGES" => "zh_TW" }) + example.run + subject.instance_variable_set(:@localed_conf, original) end context "and language is not zh_HK" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/package/yast2-country.changes new/yast2-country-4.3.11/package/yast2-country.changes --- old/yast2-country-4.3.10/package/yast2-country.changes 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/package/yast2-country.changes 2020-12-16 09:35:35.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 15 14:49:46 UTC 2020 - Stefan Schubert <sch...@suse.de> + +- Removed old code for sysvinit configuration (bsc#1175494). +- 4.3.11 + +------------------------------------------------------------------- Thu Oct 15 07:49:20 UTC 2020 - Steffen Winterfeldt <snw...@suse.de> - adjust keyboard client layout to also fit the firstboot workflow diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/package/yast2-country.spec new/yast2-country-4.3.11/package/yast2-country.spec --- old/yast2-country-4.3.10/package/yast2-country.spec 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/package/yast2-country.spec 2020-12-16 09:35:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.3.10 +Version: 4.3.11 Release: 0 Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone) License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/test/test_helper.rb new/yast2-country-4.3.11/test/test_helper.rb --- old/yast2-country-4.3.10/test/test_helper.rb 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/test/test_helper.rb 2020-12-16 09:35:35.000000000 +0100 @@ -9,6 +9,14 @@ require "rspec" require "yast/rspec" +RSpec.configure do |config| + config.mock_with :rspec do |c| + # make sure we mock only the existing methods + # https://relishapp.com/rspec/rspec-mocks/v/3-0/docs/verifying-doubles/partial-doubles + c.verify_partial_doubles = true + end +end + if ENV["COVERAGE"] require "simplecov" SimpleCov.start do @@ -19,12 +27,20 @@ # for correct coverage report we need to load all ruby files SimpleCov.track_files("#{root_location}/**/src/**/*.rb") - # use coveralls for on-line code coverage reporting at Travis CI - if ENV["TRAVIS"] - require "coveralls" + # additionally use the LCOV format for on-line code coverage reporting at CI + if ENV["CI"] || ENV["COVERAGE_LCOV"] + require "simplecov-lcov" + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.report_with_single_file = true + # this is the default Coveralls GitHub Action location + # https://github.com/marketplace/actions/coveralls-github-action + c.single_report_path = "coverage/lcov.info" + end + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter + SimpleCov::Formatter::LcovFormatter ] end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/timezone/src/lib/y2country/clients/timezone_auto.rb new/yast2-country-4.3.11/timezone/src/lib/y2country/clients/timezone_auto.rb --- old/yast2-country-4.3.10/timezone/src/lib/y2country/clients/timezone_auto.rb 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/timezone/src/lib/y2country/clients/timezone_auto.rb 2020-12-16 09:35:35.000000000 +0100 @@ -12,9 +12,12 @@ include Yast::Logger - def change + def initialize Yast.include self, "timezone/dialogs.rb" + super + end + def change Wizard.CreateDialog Wizard.HideAbortButton ret = TimezoneDialog({ "enable_back" => true, "enable_next" => true }) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/timezone/test/Timezone_test.rb new/yast2-country-4.3.11/timezone/test/Timezone_test.rb --- old/yast2-country-4.3.10/timezone/test/Timezone_test.rb 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/timezone/test/Timezone_test.rb 2020-12-16 09:35:35.000000000 +0100 @@ -96,7 +96,7 @@ describe "#Set" do before do - allow(Yast::Misc).to receive(:SysconfigRead).with(Yast::Path.new(".sysconfig.clock.TIMEZONE")) + allow(Yast::Misc).to receive(:SysconfigRead).with(Yast::Path.new(".sysconfig.clock.TIMEZONE"), anything) .and_return("Europe/Berlin") allow(Yast::Misc).to receive(:SysconfigRead).and_call_original allow(Yast::FileUtils).to receive(:IsLink).with("/etc/localtime").and_return(false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.3.10/timezone/test/timezone_auto_test.rb new/yast2-country-4.3.11/timezone/test/timezone_auto_test.rb --- old/yast2-country-4.3.10/timezone/test/timezone_auto_test.rb 2020-10-15 10:15:50.000000000 +0200 +++ new/yast2-country-4.3.11/timezone/test/timezone_auto_test.rb 2020-12-16 09:35:35.000000000 +0100 @@ -21,6 +21,7 @@ require_relative "test_helper" require "y2country/clients/timezone_auto" +require_relative "../src/include/timezone/dialogs.rb" describe Yast::TimezoneAutoClient do subject(:client) { Yast::TimezoneAutoClient.new } @@ -30,13 +31,13 @@ allow(Yast::Wizard).to receive(:CreateDialog) allow(Yast::Wizard).to receive(:CloseDialog) allow(Yast::Wizard).to receive(:HideAbortButton) - allow(subject).to receive(:TimezoneDialog).with( + allow(client).to receive(:TimezoneDialog).with( {"enable_back"=>true, "enable_next"=>true}) .and_return(true) end it "runs timezone dialog" do - expect(subject).to receive(:TimezoneDialog).with( + expect(client).to receive(:TimezoneDialog).with( {"enable_back"=>true, "enable_next"=>true}) .and_return(true) client.change _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
