Hello community, here is the log from the commit of package yast2-online-update for openSUSE:Factory checked in at 2015-01-30 23:57:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-online-update (Old) and /work/SRC/openSUSE:Factory/.yast2-online-update.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-online-update" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-online-update/yast2-online-update.changes 2014-12-05 21:02:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-online-update.new/yast2-online-update.changes 2015-01-30 23:57:24.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 29 12:01:20 UTC 2015 - jreidinger@suse.com + +- remove obsolete legacy patch callbacks +- 3.1.9 + +------------------------------------------------------------------- Old: ---- yast2-online-update-3.1.8.tar.bz2 New: ---- yast2-online-update-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.ClZ7ar/_old 2015-01-30 23:57:25.000000000 +0100 +++ /var/tmp/diff_new_pack.ClZ7ar/_new 2015-01-30 23:57:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-online-update # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # 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-online-update -Version: 3.1.8 +Version: 3.1.9 Release: 0 Url: https://github.com/yast/yast-online-update ++++++ yast2-online-update-3.1.8.tar.bz2 -> yast2-online-update-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-3.1.8/package/yast2-online-update.changes new/yast2-online-update-3.1.9/package/yast2-online-update.changes --- old/yast2-online-update-3.1.8/package/yast2-online-update.changes 2014-12-04 11:00:35.000000000 +0100 +++ new/yast2-online-update-3.1.9/package/yast2-online-update.changes 2015-01-29 13:22:10.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 29 12:01:20 UTC 2015 - jreidinger@suse.com + +- remove obsolete legacy patch callbacks +- 3.1.9 + +------------------------------------------------------------------- Thu Dec 4 09:50:39 UTC 2014 - jreidinger@suse.com - remove X-KDE-Library from desktop file (bnc#899104) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-3.1.8/package/yast2-online-update.spec new/yast2-online-update-3.1.9/package/yast2-online-update.spec --- old/yast2-online-update-3.1.8/package/yast2-online-update.spec 2014-12-04 11:00:35.000000000 +0100 +++ new/yast2-online-update-3.1.9/package/yast2-online-update.spec 2015-01-29 13:22:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-online-update -Version: 3.1.8 +Version: 3.1.9 Release: 0 Url: https://github.com/yast/yast-online-update diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-3.1.8/src/modules/OnlineUpdateCallbacks.rb new/yast2-online-update-3.1.9/src/modules/OnlineUpdateCallbacks.rb --- old/yast2-online-update-3.1.8/src/modules/OnlineUpdateCallbacks.rb 2014-12-04 11:00:35.000000000 +0100 +++ new/yast2-online-update-3.1.9/src/modules/OnlineUpdateCallbacks.rb 2015-01-29 13:22:10.000000000 +0100 @@ -202,7 +202,7 @@ def DoneProvide(error, reason, name) ret = PackageCallbacks.DoneProvide(error, reason, name) if ret == "I" - FinishLine(false) if @last_callback != "FinishPatchDeltaProvide" + FinishLine(false) if @last_callback != "FinishDeltaProvide" @total_progress = Ops.add(@total_progress, 1) if UI.WidgetExists(Id(:you_total_progress)) UI.ChangeWidget(Id(:you_total_progress), :Value, @total_progress) @@ -215,9 +215,6 @@ def DoneDownload(error_value, error_text) Builtins.y2debug("DoneDownload %1, %2", error_value, error_text) PackageCallbacks.DoneDownload(error_value, error_text) - # if (last_callback != "FinishPatchDeltaProvide") - # FinishLine (false); - # last_callback = "DoneDownload"; nil end @@ -323,58 +320,10 @@ nil end - # callback for start of downloading patch - def StartPatchDownload(name, download_size) - # progress log item (%1 is name of delta RPM) - ProgressLog(Ops.add("\n", @indent)) if @last_callback == "StartProvide" - # Progress log; lave the space at the end, some other text may follow. - ProgressLog(Builtins.sformat(_("Downloading patch RPM %1 "), name)) - if UI.WidgetExists(Id(:you_patch_progress)) - UI.ChangeWidget( - Id(:you_patch_progress), - :Label, - # progress bar label - _("Patch RPM Download Progress") - ) - UI.ChangeWidget(Id(:you_patch_progress), :Value, 0) - end - @last_callback = "StartPatchDownload" - - nil - end - - # callback for path download progress - # @return [Boolean] abort the download? - def ProgressPatchDownload(num) - Builtins.y2debug("ProgressPatchDownload %1", num) - ret = PatchProgressCallback(num) - @last_callback = "ProgressPatchDownload" - ret - end - - - # callback for problem during aplying delta - def ProblemPatchDownload(description) - Builtins.y2debug("ProblemPatchDownload: %1", description) - ProgressLog( - Ops.add( - Ops.add( - Ops.add("\n", @indent), - # progress log item (previous action failed(%1 is reason) - Builtins.sformat(_("Failed to download patch RPM: %1"), description) - ), - "\n" - ) - ) - @last_callback = "ProblemPatchDownload" - - nil - end - # finish of download/application of delta or patch download - def FinishPatchDeltaProvide + def FinishDeltaProvide FinishLine(false) if @last_callback != "DoneDownload" - @last_callback = "FinishPatchDeltaProvide" + @last_callback = "FinishDeltaProvide" nil end @@ -552,7 +501,7 @@ fun_ref(method(:ProblemDeltaDownload), "void (string)") ) Pkg.CallbackFinishDeltaDownload( - fun_ref(method(:FinishPatchDeltaProvide), "void ()") + fun_ref(method(:FinishDeltaProvide), "void ()") ) # delta application @@ -566,21 +515,7 @@ fun_ref(method(:ProblemDeltaApply), "void (string)") ) Pkg.CallbackFinishDeltaApply( - fun_ref(method(:FinishPatchDeltaProvide), "void ()") - ) - - # patch download - Pkg.CallbackStartPatchDownload( - fun_ref(method(:StartPatchDownload), "void (string, integer)") - ) - Pkg.CallbackProgressPatchDownload( - fun_ref(method(:ProgressPatchDownload), "boolean (integer)") - ) - Pkg.CallbackProblemPatchDownload( - fun_ref(method(:ProblemPatchDownload), "void (string)") - ) - Pkg.CallbackFinishPatchDownload( - fun_ref(method(:FinishPatchDeltaProvide), "void ()") + fun_ref(method(:FinishDeltaProvide), "void ()") ) # script callbacks @@ -675,10 +610,6 @@ publish :function => :StartDeltaApply, :type => "void (string)" publish :function => :ProgressDeltaApply, :type => "void (integer)" publish :function => :ProblemDeltaApply, :type => "void (string)" - publish :function => :StartPatchDownload, :type => "void (string, integer)" - publish :function => :ProgressPatchDownload, :type => "boolean (integer)" - publish :function => :ProblemPatchDownload, :type => "void (string)" - publish :function => :FinishPatchDeltaProvide, :type => "void ()" publish :function => :ScriptStart, :type => "void (string, string, string, string)" publish :function => :ScriptProgress, :type => "boolean (boolean, string)" publish :function => :ScriptProblem, :type => "string (string)" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org