Hello community, here is the log from the commit of package yast2-snapper for openSUSE:Factory checked in at 2018-07-27 10:50:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-snapper (Old) and /work/SRC/openSUSE:Factory/.yast2-snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-snapper" Fri Jul 27 10:50:47 2018 rev:57 rq:625385 version:4.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-snapper/yast2-snapper.changes 2018-07-01 21:25:11.468862557 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-snapper.new/yast2-snapper.changes 2018-07-27 10:50:51.833028729 +0200 @@ -1,0 +2,13 @@ +Wed Jul 25 10:42:11 UTC 2018 - [email protected] + +- Use the correct snapshot number when restoring selected massively + (bsc#956955) +- 4.0.4 + +------------------------------------------------------------------- +Tue Jul 24 10:14:06 CEST 2018 - [email protected] + +- Do not translate items of snapshot combo box. (bsc#1086633) +- 4.0.3 + +------------------------------------------------------------------- Old: ---- yast2-snapper-4.0.2.tar.bz2 New: ---- yast2-snapper-4.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-snapper.spec ++++++ --- /var/tmp/diff_new_pack.d3vCcS/_old 2018-07-27 10:50:52.473029955 +0200 +++ /var/tmp/diff_new_pack.d3vCcS/_new 2018-07-27 10:50:52.477029962 +0200 @@ -17,7 +17,7 @@ Name: yast2-snapper -Version: 4.0.2 +Version: 4.0.4 Release: 0 # change to noarch causes problems according to behlert ++++++ yast2-snapper-4.0.2.tar.bz2 -> yast2-snapper-4.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-4.0.2/.travis.yml new/yast2-snapper-4.0.4/.travis.yml --- old/yast2-snapper-4.0.2/.travis.yml 2018-06-29 16:32:36.000000000 +0200 +++ new/yast2-snapper-4.0.4/.travis.yml 2018-07-26 11:12:20.000000000 +0200 @@ -5,6 +5,9 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-4.0.2/package/yast2-snapper.changes new/yast2-snapper-4.0.4/package/yast2-snapper.changes --- old/yast2-snapper-4.0.2/package/yast2-snapper.changes 2018-06-29 16:32:36.000000000 +0200 +++ new/yast2-snapper-4.0.4/package/yast2-snapper.changes 2018-07-26 11:12:20.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Jul 25 10:42:11 UTC 2018 - [email protected] + +- Use the correct snapshot number when restoring selected massively + (bsc#956955) +- 4.0.4 + +------------------------------------------------------------------- +Tue Jul 24 10:14:06 CEST 2018 - [email protected] + +- Do not translate items of snapshot combo box. (bsc#1086633) +- 4.0.3 + +------------------------------------------------------------------- Tue Jun 26 16:58:18 CEST 2018 - [email protected] - Added additional searchkeys to desktop file (fate#321043). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-4.0.2/package/yast2-snapper.spec new/yast2-snapper-4.0.4/package/yast2-snapper.spec --- old/yast2-snapper-4.0.2/package/yast2-snapper.spec 2018-06-29 16:32:36.000000000 +0200 +++ new/yast2-snapper-4.0.4/package/yast2-snapper.spec 2018-07-26 11:12:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-snapper -Version: 4.0.2 +Version: 4.0.4 Release: 0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-4.0.2/src/include/snapper/dialogs.rb new/yast2-snapper-4.0.4/src/include/snapper/dialogs.rb --- old/yast2-snapper-4.0.2/src/include/snapper/dialogs.rb 2018-06-29 16:32:36.000000000 +0200 +++ new/yast2-snapper-4.0.4/src/include/snapper/dialogs.rb 2018-07-26 11:12:20.000000000 +0200 @@ -666,8 +666,13 @@ combo_items, Item( Id(id), + # "%1: %2" must not to be translated (bnc#1086633) + # because "description" is already a translated string + # and it seems that for some translations this could be a + # problem regarding UTF-8 encoding. E.g. zh_CN.UTF-8 in our case + # here. Builtins.sformat( - _("%1: %2"), + "%1: %2", id, Ops.get_string(s, "description", "") ) @@ -941,7 +946,7 @@ 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())) @@ -959,7 +964,7 @@ 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 @@ -1096,10 +1101,8 @@ 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) @@ -1170,10 +1173,10 @@ "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 @@ -1209,7 +1212,7 @@ "<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, @@ -1218,7 +1221,7 @@ Label.NoButton, :focus_no ) - Snapper.RestoreFiles(pre_num, filenames) + Snapper.RestoreFiles(from, filenames) break end next
