Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2020-12-01 14:21:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Tue Dec 1 14:21:24 2020 rev:458 rq:851255 version:4.3.22 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2020-11-02 14:04:26.228683440 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new.5913/yast2-installation.changes 2020-12-01 14:21:25.737505194 +0100 @@ -1,0 +2,12 @@ +Thu Nov 26 19:13:34 UTC 2020 - Josef Reidinger <jreidinger@suse.com> + +- correct add-on spelling (jsc#SLE-14772) +- 4.3.22 + +------------------------------------------------------------------- +Thu Nov 26 14:06:30 UTC 2020 - Steffen Winterfeldt <snwint@suse.com> + +- fix full media product selection (bsc#1179094, bsc#1176424) +- 4.3.21 + +------------------------------------------------------------------- Old: ---- yast2-installation-4.3.20.tar.bz2 New: ---- yast2-installation-4.3.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.AGu5OI/_old 2020-12-01 14:21:26.493506011 +0100 +++ /var/tmp/diff_new_pack.AGu5OI/_new 2020-12-01 14:21:26.497506016 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.3.20 +Version: 4.3.22 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only ++++++ yast2-installation-4.3.20.tar.bz2 -> yast2-installation-4.3.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/.github/workflows/ci.yml new/yast2-installation-4.3.22/.github/workflows/ci.yml --- old/yast2-installation-4.3.20/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-4.3.22/.github/workflows/ci.yml 2020-11-27 09:55:07.000000000 +0100 @@ -0,0 +1,88 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-acti... + +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@v1 + + # 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 }} + + Rubocop: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v1 + + - 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@v1 + + - 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@v1 + + - name: Yardoc + run: rake check:doc + + # 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@v1 + + - name: Perl Syntax + run: yast-ci-ruby -o perl_syntax + + - name: POT Check + run: rake check:pot + + - name: Shell Check + run: shellcheck startup/First-Stage/F08-logging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/.travis.yml new/yast2-installation-4.3.22/.travis.yml --- old/yast2-installation-4.3.20/.travis.yml 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/.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-installation-image . - -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 --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-installation-image yast-travis-ruby - - docker run -it yast-installation-image rake check:doc - - docker run -it yast-installation-image shellcheck startup/First-Stage/F08-logging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/Dockerfile new/yast2-installation-4.3.22/Dockerfile --- old/yast2-installation-4.3.20/Dockerfile 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest -RUN zypper --non-interactive in --no-recommends yast2-ntp-client -COPY . /usr/src/app - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/README.md new/yast2-installation-4.3.22/README.md --- old/yast2-installation-4.3.20/README.md 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/README.md 2020-11-27 09:55:07.000000000 +0100 @@ -1,8 +1,10 @@ YaST Installation Framework =========================== -[](https://travis-ci.org/yast/yast-installation) -[](https://ci.opensuse.org/view/Yast/job/yast-installation-master/) +[]( +https://github.com/yast/yast-installation/actions?query=branch%3Amaster) +[]( +https://ci.opensuse.org/view/Yast/job/yast-yast-installation-master/) [](https://coveralls.io/github/yast/yast-installation?branch=master) Description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/doc/installer_extension.md new/yast2-installation-4.3.22/doc/installer_extension.md --- old/yast2-installation-4.3.20/doc/installer_extension.md 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/doc/installer_extension.md 2020-11-27 09:55:07.000000000 +0100 @@ -141,7 +141,7 @@ def main # TRANSLATORS: A popup message - Popup.Message(_("This is an inserted step from the testing-extension addon."\ + Popup.Message(_("This is an inserted step from the testing-extension add-on."\ "\n\nPress OK to continue.")) return :auto end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/package/yast2-installation.changes new/yast2-installation-4.3.22/package/yast2-installation.changes --- old/yast2-installation-4.3.20/package/yast2-installation.changes 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/package/yast2-installation.changes 2020-11-27 09:55:07.000000000 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Nov 26 19:13:34 UTC 2020 - Josef Reidinger <jreidinger@suse.com> + +- correct add-on spelling (jsc#SLE-14772) +- 4.3.22 + +------------------------------------------------------------------- +Thu Nov 26 14:06:30 UTC 2020 - Steffen Winterfeldt <snwint@suse.com> + +- fix full media product selection (bsc#1179094, bsc#1176424) +- 4.3.21 + +------------------------------------------------------------------- Tue Oct 27 22:30:43 UTC 2020 - Knut Anderssen <kanderssen@suse.com> - Write hostname and proxy configuration to the inst-sys when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/package/yast2-installation.spec new/yast2-installation-4.3.22/package/yast2-installation.spec --- old/yast2-installation-4.3.20/package/yast2-installation.spec 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/package/yast2-installation.spec 2020-11-27 09:55:07.000000000 +0100 @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.3.20 +Version: 4.3.22 Release: 0 Group: System/YaST License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/src/lib/installation/clients/inst_complex_welcome.rb new/yast2-installation-4.3.22/src/lib/installation/clients/inst_complex_welcome.rb --- old/yast2-installation-4.3.20/src/lib/installation/clients/inst_complex_welcome.rb 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/src/lib/installation/clients/inst_complex_welcome.rb 2020-11-27 09:55:07.000000000 +0100 @@ -158,7 +158,7 @@ # list because the dialog will not show the license (we do not know which product we are # upgrading yet) nor the product selector (as you cannot change the product during upgrade). # - # @return [Array<Y2Packager::Product>,Array<Y2Packager::ProductControlProduct] List of + # @return [Array<Y2Packager::Product>, Array<Y2Packager::ProductControlProduct, Array<Y2Packager::ProductLocation>] List of # available base products; if any, a list containing only the forced base product; # empty list in update mode. def products @@ -171,7 +171,8 @@ # Returns all available base products # - # @return [Array<Y2Packager::Product>, Array<Y2Packager::ProductControlProduct>] List of available base products + # @return [Array<Y2Packager::Product>, Array<Y2Packager::ProductControlProduct>, Array<Y2Packager::ProductLocation>] List of + # available base products def available_base_products return @available_base_products if @available_base_products @@ -224,13 +225,24 @@ end end + # Show product selection screen even when only a single product is available. + # + # This serves mainly to delay the license confirmation to a later point + # (when the license has been read). + # + # @return [Boolean] true if product selection is preferred over license + # confirmation + def allow_single_product_selection? + products.size == 1 && !products.first.respond_to?(:license) + end + # Determine whether selected product license should be confirmed # # If more than 1 product exists, it is supposed to be accepted later. # # @return [Boolean] true if it should be accepted; false otherwise. def license_confirmation_required? - return false if products.size > 1 + return false if products.size > 1 || allow_single_product_selection? selected_product.license_confirmation_required? end @@ -241,7 +253,7 @@ # agreement confirmed when required; false otherwise def product_selection_finished? if selected_product.nil? - return true if products.size <= 1 + return true if products.size <= 1 && !allow_single_product_selection? Yast::Popup.Error(_("Please select a product to install.")) return false elsif license_confirmation_required? && !selected_product.license_confirmed? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/src/lib/installation/clients/inst_update_installer.rb new/yast2-installation-4.3.22/src/lib/installation/clients/inst_update_installer.rb --- old/yast2-installation-4.3.20/src/lib/installation/clients/inst_update_installer.rb 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/src/lib/installation/clients/inst_update_installer.rb 2020-11-27 09:55:07.000000000 +0100 @@ -385,7 +385,7 @@ # TRANSLATORS: progress label _("Add Update Repository"), _("Download the Packages"), - _("Copy the Addon Packages"), + _("Copy the Add-on Packages"), _("Apply the Packages"), _("Restart") ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/src/lib/installation/dialogs/complex_welcome.rb new/yast2-installation-4.3.22/src/lib/installation/dialogs/complex_welcome.rb --- old/yast2-installation-4.3.20/src/lib/installation/dialogs/complex_welcome.rb 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/src/lib/installation/dialogs/complex_welcome.rb 2020-11-27 09:55:07.000000000 +0100 @@ -133,11 +133,11 @@ # Determine whether the license must be shown # - # The license will be shown when only one product is available. + # The license will be shown when only one product with license information is available. # # @return [Boolean] true if the license must be shown; false otherwise def show_license? - products.size == 1 + products.size == 1 && products.first.respond_to?(:license) end # Determine whether some product is available or not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/test/dialogs/complex_welcome_test.rb new/yast2-installation-4.3.22/test/dialogs/complex_welcome_test.rb --- old/yast2-installation-4.3.20/test/dialogs/complex_welcome_test.rb 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/test/dialogs/complex_welcome_test.rb 2020-11-27 09:55:07.000000000 +0100 @@ -4,6 +4,22 @@ require "installation/dialogs/complex_welcome" describe Installation::Dialogs::ComplexWelcome do + RSpec.shared_examples "show_license" do + it "shows the product license" do + expect(Y2Packager::Widgets::ProductLicense).to receive(:new) + .with(products.first, skip_validation: true).and_return(license_widget) + expect(widget.contents.to_s).to include("license_widget") + end + end + + RSpec.shared_examples "show_selector" do + it "shows the product selector" do + expect(Installation::Widgets::ProductSelector).to receive(:new) + .with(products, skip_validation: true) + expect(widget.contents.to_s).to include("selector_widget") + end + end + subject(:widget) { described_class.new(products) } let(:products) { [] } @@ -27,7 +43,14 @@ end describe "#content" do - let(:sles_product) { instance_double("Y2Packager::Product", label: "SLES") } + let(:license) { instance_double("Y2Packager::ProductLicense") } + # there are 3 different 'product' classes: Y2Packager::Product, Y2Packager::ProductControlProduct, Y2Packager::ProductLocation + let(:sles_product) { instance_double("Y2Packager::Product", label: "SLES", license: license) } + let(:sles_online_product) { instance_double("Y2Packager::ProductControlProduct", label: "SLES", license: license) } + let(:sles_offline_product) { instance_double("Y2Packager::ProductLocation", label: "SLES") } + let(:sled_product) { instance_double("Y2Packager::Product", label: "SLED", license: license) } + let(:sled_online_product) { instance_double("Y2Packager::ProductControlProduct", label: "SLED", license: license) } + let(:sled_offline_product) { instance_double("Y2Packager::ProductLocation", label: "SLED") } let(:language_widget) { Yast::Term.new(:language_widget) } let(:keyboard_widget) { Yast::Term.new(:keyboard_widget) } let(:license_widget) { Yast::Term.new(:license_widget) } @@ -50,23 +73,32 @@ end context "when only 1 product is available" do - let(:products) { [sles_product] } - - it "shows the product license" do - expect(Y2Packager::Widgets::ProductLicense).to receive(:new) - .with(products.first, skip_validation: true).and_return(license_widget) - expect(widget.contents.to_s).to include("license_widget") + context "when it is the normal medium" do + let(:products) { [sles_product] } + include_examples "show_license" + end + context "when it is the online medium" do + let(:products) { [sles_online_product] } + include_examples "show_license" + end + context "when it is the offline medium" do + let(:products) { [sles_offline_product] } + include_examples "show_selector" end end context "when more than 1 product is available" do - let(:sled_product) { instance_double("Y2Packager::Product", label: "SLED") } - let(:products) { [sles_product, sled_product] } - - it "shows the product selector" do - expect(Installation::Widgets::ProductSelector).to receive(:new) - .with(products, skip_validation: true) - expect(widget.contents.to_s).to include("selector_widget") + context "when it is the normal medium" do + let(:products) { [sles_product, sled_product] } + include_examples "show_selector" + end + context "when it is the online medium" do + let(:products) { [sles_online_product, sled_online_product] } + include_examples "show_selector" + end + context "when it is the offline medium" do + let(:products) { [sles_offline_product, sled_offline_product] } + include_examples "show_selector" end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.20/test/test_helper.rb new/yast2-installation-4.3.22/test/test_helper.rb --- old/yast2-installation-4.3.20/test/test_helper.rb 2020-10-30 10:33:48.000000000 +0100 +++ new/yast2-installation-4.3.22/test/test_helper.rb 2020-11-27 09:55:07.000000000 +0100 @@ -50,12 +50,20 @@ # For coverage we need to load all ruby files SimpleCov.track_files("{#{srcdir}/**/*.rb,#{bindir}/{yupdate,memsample-archive-to-csv}}") - # 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