Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package yast2-snapper for openSUSE:Factory 
checked in at 2022-01-25 17:35:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-snapper (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-snapper.new.1938 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-snapper"

Tue Jan 25 17:35:55 2022 rev:63 rq:948419 version:4.4.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-snapper/yast2-snapper.changes      
2021-04-23 17:50:31.142783178 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-snapper.new.1938/yast2-snapper.changes    
2022-01-25 17:37:00.653945572 +0100
@@ -1,0 +2,7 @@
+Mon Jan 24 09:44:41 UTC 2022 - David Diaz <dgonza...@suse.com>
+
+- Do not crash when trying to show found differences
+  between snapshots (bsc#1195021).
+- 4.4.2
+
+-------------------------------------------------------------------

Old:
----
  yast2-snapper-4.4.1.tar.bz2

New:
----
  yast2-snapper-4.4.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-snapper.spec ++++++
--- /var/tmp/diff_new_pack.zRmBQR/_old  2022-01-25 17:37:02.177935075 +0100
+++ /var/tmp/diff_new_pack.zRmBQR/_new  2022-01-25 17:37:02.181935049 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-snapper
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-snapper
-Version:        4.4.1
+Version:        4.4.2
 Release:        0
 Summary:        YaST - file system snapshots review
 License:        GPL-2.0-only

++++++ yast2-snapper-4.4.1.tar.bz2 -> yast2-snapper-4.4.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-snapper-4.4.1/.github/workflows/ci.yml 
new/yast2-snapper-4.4.2/.github/workflows/ci.yml
--- old/yast2-snapper-4.4.1/.github/workflows/ci.yml    2021-04-21 
09:09:54.000000000 +0200
+++ new/yast2-snapper-4.4.2/.github/workflows/ci.yml    2022-01-24 
15:37:16.000000000 +0100
@@ -8,7 +8,14 @@
 jobs:
   Tests:
     runs-on: ubuntu-latest
-    container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        distro:  [ "tumbleweed", "leap_latest" ]
+
+    container:
+      image: 
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -27,13 +34,22 @@
 
     # send the coverage report to coveralls.io
     - name: Coveralls Report
+      # send it only from the TW build to avoid duplicate submits
+      if: ${{ matrix.distro == 'tumbleweed' }}
       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
+
+    strategy:
+      fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
+
+    container:
+      image: 
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -45,7 +61,14 @@
 
   Package:
     runs-on: ubuntu-latest
-    container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        distro:  [ "tumbleweed", "leap_latest" ]
+
+    container:
+      image: 
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -57,7 +80,14 @@
 
   Yardoc:
     runs-on: ubuntu-latest
-    container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
+
+    container:
+      image: 
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
@@ -71,7 +101,14 @@
   # checks into one job avoids that overhead
   Checks:
     runs-on: ubuntu-latest
-    container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        distro: [ "leap_latest" ]
+
+    container:
+      image: 
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
 
     steps:
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-snapper-4.4.1/package/yast2-snapper.changes 
new/yast2-snapper-4.4.2/package/yast2-snapper.changes
--- old/yast2-snapper-4.4.1/package/yast2-snapper.changes       2021-04-21 
09:09:54.000000000 +0200
+++ new/yast2-snapper-4.4.2/package/yast2-snapper.changes       2022-01-24 
15:37:16.000000000 +0100
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Jan 24 09:44:41 UTC 2022 - David Diaz <dgonza...@suse.com>
+
+- Do not crash when trying to show found differences
+  between snapshots (bsc#1195021).
+- 4.4.2
+
+-------------------------------------------------------------------
 Tue Apr 20 18:14:05 UTC 2021 - Dirk M??ller <dmuel...@suse.com>
 
 - stop packaging docdir, it only contained the license which
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-snapper-4.4.1/package/yast2-snapper.spec 
new/yast2-snapper-4.4.2/package/yast2-snapper.spec
--- old/yast2-snapper-4.4.1/package/yast2-snapper.spec  2021-04-21 
09:09:54.000000000 +0200
+++ new/yast2-snapper-4.4.2/package/yast2-snapper.spec  2022-01-24 
15:37:16.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-snapper
-Version:        4.4.1
+Version:        4.4.2
 Release:        0
 Summary:        YaST - file system snapshots review
 License:        GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-snapper-4.4.1/src/modules/Snapper.rb 
new/yast2-snapper-4.4.2/src/modules/Snapper.rb
--- old/yast2-snapper-4.4.1/src/modules/Snapper.rb      2021-04-21 
09:09:54.000000000 +0200
+++ new/yast2-snapper-4.4.2/src/modules/Snapper.rb      2022-01-24 
15:37:16.000000000 +0100
@@ -149,7 +149,7 @@
         # the file diff
         elsif Ops.get(out, "stdout") != ""
           status = ["diff"]
-          ret["diff"] = out["stdout"].encode(Encoding::UTF_8, { :invalid => 
:replace })
+          ret["diff"] = out["stdout"].encode(Encoding::UTF_8, :invalid => 
:replace)
         end
 
         # check mode and ownerships
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-snapper-4.4.1/test/snapper_test.rb 
new/yast2-snapper-4.4.2/test/snapper_test.rb
--- old/yast2-snapper-4.4.1/test/snapper_test.rb        2021-04-21 
09:09:54.000000000 +0200
+++ new/yast2-snapper-4.4.2/test/snapper_test.rb        2022-01-24 
15:37:16.000000000 +0100
@@ -5,6 +5,27 @@
 Yast.import "Snapper"
 
 describe Yast::Snapper do
+  describe "GetFileModification" do
+    # Quite mocking test just for ensuring bsc#1195021 does not happen again
+    context "when there are differences" do
+      before do
+        allow(subject).to 
receive(:GetSnapshotPath).with(anything).and_return("")
+        allow(Yast::SCR).to receive(:Execute).with(anything, /diff/)
+          .and_return({ "stderr" => "", "stdout" => "Found differences: \xA1 
\xA1" })
+        allow(Yast::SCR).to receive(:Execute).with(anything, /ls/)
+          .and_return("mode1 user1 group1 mode2 mode2 user2 group2")
+        allow(Yast::FileUtils).to receive(:Exists).and_return(true)
+      end
+
+      it "does not crash while encoding" do
+        result = subject.GetFileModification("fake_file_1", 2, 3)
+
+        expect(result).to be_a(Hash)
+        expect(result["diff"]).to include("Found differences")
+      end
+    end
+  end
+
   describe "#userdata_to_string" do
     it "call with empty userdata" do
       expect(Yast::Snapper.userdata_to_string({})).to eq("")

Reply via email to