Merge branch 'SLE-15-GA' into merge_SLE-15-GA

yast · Jul 26, 2018 · eb426cd · eb426cd
2 parents 0c18948 + 5e74666
commit eb426cd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,9 @@ services:
 
 before_install:
   - docker build -t yast-snapper-image .
+  # list the installed packages (just for easier debugging)
+  - docker run --rm -it yast-snapper-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

diff --git a/package/yast2-snapper.changes b/package/yast2-snapper.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul 25 10:42:11 UTC 2018 - knut.anderssen@suse.com
+
+- Use the correct snapshot number when restoring selected massively
+  (bsc#956955)
+- 4.0.4
+
 -------------------------------------------------------------------
 Tue Jul 24 10:14:06 CEST 2018 - schubi@suse.de
 

diff --git a/package/yast2-snapper.spec b/package/yast2-snapper.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-snapper
-Version:        4.0.3
+Version:        4.0.4
 Release:        0
 Group:		System/YaST
 

diff --git a/src/include/snapper/dialogs.rb b/src/include/snapper/dialogs.rb
@@ -946,7 +946,7 @@ def ShowDialog
                 HSpacing(0.5)
               )
             )
-            show_file_modification.call(current_file, pre_num, snapshot_num)
+            show_file_modification.call(current_file, from, to)
           end
         else
           UI.ReplaceWidget(Id(:diff_chooser), VBox(VStretch()))
@@ -964,7 +964,7 @@ def ShowDialog
           Right(Label(date))
         )
       else
-        tree_label = "%{pre} && %{post}" % { :pre => pre_num, :post => snapshot_num }
+        tree_label = "%{pre} && %{post}" % { :pre => from, :post => to }
         date_widget = VBox(
           HBox(
             # label, date string will follow at the end of line
@@ -1101,10 +1101,8 @@ def ShowDialog
         elsif ret == :diff_snapshot
           if type == :SINGLE
             UI.ChangeWidget(Id(:selection_snapshots), :Enabled, false)
-            show_file_modification.call(current_file, snapshot_num, 0)
-          else
-            show_file_modification.call(current_file, pre_num, snapshot_num)
           end
+          show_file_modification.call(current_file, from, to)
 
         elsif ret == :diff_arbitrary || ret == :selection_snapshots
           UI.ChangeWidget(Id(:selection_snapshots), :Enabled, true)
@@ -1175,10 +1173,10 @@ def ShowDialog
                     "from snapshot '%2' to current system?"
                 ),
                 Snapper.GetFileFullPath(current_filename),
-                snapshot_num
+                from
               )
             )
-            Snapper.RestoreFiles(snapshot_num, [current_filename])
+            Snapper.RestoreFiles(from, [current_filename])
           end
           next
 
@@ -1214,7 +1212,7 @@ def ShowDialog
                     "<p>Files existing in original snapshot will be copied to current system.</p>\n" +
                     "<p>Files that did not exist in the snapshot will be deleted.</p>Are you sure?"
                 ),
-                pre_num,
+                from,
                 to_restore.join("<br>")
               ),
               60,
@@ -1223,7 +1221,7 @@ def ShowDialog
               Label.NoButton,
               :focus_no
             )
-            Snapper.RestoreFiles(pre_num, filenames)
+            Snapper.RestoreFiles(from, filenames)
             break
           end
           next