Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-docker for openSUSE:Factory checked in at 2024-04-17 16:20:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-docker (Old) and /work/SRC/openSUSE:Factory/.yast2-docker.new.26366 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-docker" Wed Apr 17 16:20:29 2024 rev:17 rq:1168549 version:5.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-docker/yast2-docker.changes 2023-10-19 22:53:48.304545741 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-docker.new.26366/yast2-docker.changes 2024-04-17 16:24:23.800670041 +0200 @@ -1,0 +2,7 @@ +Thu Apr 11 09:10:02 UTC 2024 - Martin Vidner <mvid...@suse.com> + +- Fix Internal Error with docker 25.0.0 due to VirtualSize removal + from images API (bsc#1222668, gh#yast/yast-docker#32) +- 5.0.1 + +------------------------------------------------------------------- Old: ---- yast2-docker-5.0.0.tar.bz2 New: ---- yast2-docker-5.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-docker.spec ++++++ --- /var/tmp/diff_new_pack.jYNaxd/_old 2024-04-17 16:24:24.416692577 +0200 +++ /var/tmp/diff_new_pack.jYNaxd/_new 2024-04-17 16:24:24.420692723 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-docker # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-docker -Version: 5.0.0 +Version: 5.0.1 Release: 0 Summary: YaST2 - GUI for docker management Group: System/YaST ++++++ yast2-docker-5.0.0.tar.bz2 -> yast2-docker-5.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/.github/workflows/ci.yml new/yast2-docker-5.0.1/.github/workflows/ci.yml --- old/yast2-docker-5.0.0/.github/workflows/ci.yml 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/.github/workflows/ci.yml 2024-04-17 14:54:06.000000000 +0200 @@ -1,13 +1,12 @@ - # See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions name: CI -on: [push, pull_request] +on: [ push, pull_request ] jobs: - # FIXME: No unit tests :-( + # FIXME: No unit tests :-( # Tests: # runs-on: ubuntu-latest # container: registry.opensuse.org/yast/head/containers/yast-ruby:latest @@ -39,18 +38,17 @@ strategy: fail-fast: false matrix: - distro: [ "tumbleweed", "leap_latest" ] + distro: [ "tumbleweed" ] container: image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby steps: + - name: Git Checkout + uses: actions/checkout@v2 - - name: Git Checkout - uses: actions/checkout@v2 - - - name: Rubocop - run: rake check:rubocop + - name: Rubocop + run: rake check:rubocop Package: runs-on: ubuntu-latest @@ -58,18 +56,17 @@ strategy: fail-fast: false matrix: - distro: [ "tumbleweed", "leap_latest" ] + distro: [ "tumbleweed" ] container: image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby steps: + - name: Git Checkout + uses: actions/checkout@v2 - - name: Git Checkout - uses: actions/checkout@v2 - - - name: Package Build - run: yast-ci-ruby -o package + - name: Package Build + run: yast-ci-ruby -o package Yardoc: runs-on: ubuntu-latest @@ -77,18 +74,17 @@ strategy: fail-fast: false matrix: - distro: [ "leap_latest" ] + distro: [ "tumbleweed" ] container: image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby steps: + - name: Git Checkout + uses: actions/checkout@v2 - - name: Git Checkout - uses: actions/checkout@v2 - - - name: Yardoc - run: rake check:doc + - name: Yardoc + run: rake check:doc # downloading the Docker image takes some time so bundling several fast # checks into one job avoids that overhead @@ -98,15 +94,14 @@ strategy: fail-fast: false matrix: - distro: [ "leap_latest" ] + distro: [ "tumbleweed" ] container: image: registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby steps: + - name: Git Checkout + uses: actions/checkout@v2 - - name: Git Checkout - uses: actions/checkout@v2 - - - name: POT Check - run: rake check:pot + - name: POT Check + run: rake check:pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/.rubocop.yml new/yast2-docker-5.0.1/.rubocop.yml --- old/yast2-docker-5.0.0/.rubocop.yml 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/.rubocop.yml 2024-04-17 14:54:06.000000000 +0200 @@ -1,4 +1,7 @@ # use the shared Yast defaults inherit_from: - - /usr/share/YaST2/data/devtools/data/rubocop_yast_style.yml + - /usr/share/YaST2/data/devtools/data/rubocop-1.24.1_yast_style.yml - .rubocop_todo.yml + +Style/FrozenStringLiteralComment: + Enabled: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/.rubocop_todo.yml new/yast2-docker-5.0.1/.rubocop_todo.yml --- old/yast2-docker-5.0.0/.rubocop_todo.yml 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/.rubocop_todo.yml 2024-04-17 14:54:06.000000000 +0200 @@ -15,6 +15,9 @@ Metrics/CyclomaticComplexity: Max: 14 +Metrics/BlockLength: + Max: 35 + # Offense count: 1 # Configuration parameters: CountComments. Metrics/MethodLength: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/package/yast2-docker.changes new/yast2-docker-5.0.1/package/yast2-docker.changes --- old/yast2-docker-5.0.0/package/yast2-docker.changes 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/package/yast2-docker.changes 2024-04-17 14:54:06.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 11 09:10:02 UTC 2024 - Martin Vidner <mvid...@suse.com> + +- Fix Internal Error with docker 25.0.0 due to VirtualSize removal + from images API (bsc#1222668, gh#yast/yast-docker#32) +- 5.0.1 + +------------------------------------------------------------------- Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <jreidin...@suse.cz> - 5.0.0 (bsc#1185510) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/package/yast2-docker.spec new/yast2-docker-5.0.1/package/yast2-docker.spec --- old/yast2-docker-5.0.0/package/yast2-docker.spec 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/package/yast2-docker.spec 2024-04-17 14:54:06.000000000 +0200 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-docker -Version: 5.0.0 +Version: 5.0.1 Release: 0 Summary: YaST2 - GUI for docker management Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/src/lib/ydocker/changes_dialog.rb new/yast2-docker-5.0.1/src/lib/ydocker/changes_dialog.rb --- old/yast2-docker-5.0.0/src/lib/ydocker/changes_dialog.rb 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/src/lib/ydocker/changes_dialog.rb 2024-04-17 14:54:06.000000000 +0200 @@ -33,7 +33,7 @@ return unless create_dialog begin - return controller_loop + controller_loop ensure close_dialog end @@ -48,14 +48,13 @@ end def controller_loop - loop do - input = Yast::UI.UserInput - case input - when :ok, :cancel - return :ok - else - raise "Unknown action #{input}" - end + # no need to loop, one shot is enough + input = Yast::UI.UserInput + case input + when :ok, :cancel + :ok + else + raise "Unknown action #{input}" end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/src/lib/ydocker/commit_dialog.rb new/yast2-docker-5.0.1/src/lib/ydocker/commit_dialog.rb --- old/yast2-docker-5.0.0/src/lib/ydocker/commit_dialog.rb 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/src/lib/ydocker/commit_dialog.rb 2024-04-17 14:54:06.000000000 +0200 @@ -33,7 +33,7 @@ return unless create_dialog begin - return controller_loop + controller_loop ensure close_dialog end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/src/lib/ydocker/inject_shell_dialog.rb new/yast2-docker-5.0.1/src/lib/ydocker/inject_shell_dialog.rb --- old/yast2-docker-5.0.0/src/lib/ydocker/inject_shell_dialog.rb 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/src/lib/ydocker/inject_shell_dialog.rb 2024-04-17 14:54:06.000000000 +0200 @@ -35,7 +35,7 @@ return unless create_dialog begin - return controller_loop + controller_loop ensure close_dialog end @@ -50,17 +50,15 @@ end def controller_loop - loop do - input = Yast::UI.UserInput - case input - when :ok - attach - return - when :cancel - return - else - raise "Unknown action #{input}" - end + # no need to loop, one shot is enough + input = Yast::UI.UserInput + case input + when :ok + attach + when :cancel + nil + else + raise "Unknown action #{input}" end end @@ -116,9 +114,9 @@ " || (echo \"Failed to attach. Will close window in 5 seconds\";sleep 5)" Yast::Execute.locally!("xterm", "-e", command) - rescue Cheetah::ExecutionFailed => error + rescue Cheetah::ExecutionFailed => e Yast::Popup.Error( - format(_("Failed to run terminal. Error: %{error}"), error: error.message) + format(_("Failed to run terminal. Error: %{error}"), error: e.message) ) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/src/lib/ydocker/main_dialog.rb new/yast2-docker-5.0.1/src/lib/ydocker/main_dialog.rb --- old/yast2-docker-5.0.0/src/lib/ydocker/main_dialog.rb 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/src/lib/ydocker/main_dialog.rb 2024-04-17 14:54:06.000000000 +0200 @@ -48,7 +48,7 @@ return unless create_dialog begin - return controller_loop + controller_loop ensure close_dialog end @@ -75,11 +75,11 @@ _("Docker service does not run. Should YaST start docker? Otherwise YaST quits.") ) - return Yast::Service.start("docker") + Yast::Service.start("docker") else Yast::Popup.Error(_("Docker service does not run. \ Run this module as root or start docker service manually.")) - return false + false end end @@ -155,8 +155,10 @@ def stop_container return unless Yast::Popup.YesNo(_("Do you really want to stop the running container?")) + selected_container.stop! return unless Yast::Popup.YesNo(_("Do you want to remove the container?")) + selected_container.delete redraw_containers @@ -164,8 +166,10 @@ def kill_container return unless Yast::Popup.YesNo(_("Do you really want to kill the running container?")) + selected_container.kill! return unless Yast::Popup.YesNo(_("Do you want to remove the container?")) + selected_container.delete redraw_containers @@ -275,7 +279,7 @@ tag, image.id.slice(0, 12), DateTime.strptime(image.info["Created"].to_s, "%s").to_s, - Y2Storage::DiskSize.new(image.info["VirtualSize"]).to_human_string + Y2Storage::DiskSize.new(image.info["Size"]).to_human_string ) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/src/lib/ydocker/run_image_dialog.rb new/yast2-docker-5.0.1/src/lib/ydocker/run_image_dialog.rb --- old/yast2-docker-5.0.0/src/lib/ydocker/run_image_dialog.rb 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/src/lib/ydocker/run_image_dialog.rb 2024-04-17 14:54:06.000000000 +0200 @@ -37,7 +37,7 @@ return unless create_dialog begin - return controller_loop + controller_loop ensure close_dialog end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-docker-5.0.0/test/spec_helper.rb new/yast2-docker-5.0.1/test/spec_helper.rb --- old/yast2-docker-5.0.0/test/spec_helper.rb 2023-10-18 23:15:20.000000000 +0200 +++ new/yast2-docker-5.0.1/test/spec_helper.rb 2024-04-17 14:54:06.000000000 +0200 @@ -1,5 +1,3 @@ -# encoding: utf-8 - # ------------------------------------------------------------------------------ # Copyright (c) 2017 SUSE LLC # @@ -19,7 +17,7 @@ # current contact information at www.suse.com. # ------------------------------------------------------------------------------ -$LOAD_PATH.unshift(File.expand_path("../../src/lib", __FILE__)) +$LOAD_PATH.unshift(File.expand_path("../src/lib", __dir__)) RSpec.configure do |config| config.mock_with :rspec do |c| @@ -36,7 +34,7 @@ end # track all ruby files under src - src_location = File.expand_path("../../src", __FILE__) + src_location = File.expand_path("../src", __dir__) SimpleCov.track_files("#{src_location}/**/*.rb") # additionally use the LCOV format for on-line code coverage reporting at CI
