Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-12-03 16:57:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2013-11-28 16:53:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-12-03 16:57:28.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 3 13:34:50 UTC 2013 - [email protected] + +- Update hooks +- 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-3.1.6.tar.bz2 New: ---- yast2-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.J5n5Ym/_old 2013-12-03 16:57:29.000000000 +0100 +++ /var/tmp/diff_new_pack.J5n5Ym/_new 2013-12-03 16:57:29.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-3.1.6.tar.bz2 -> yast2-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.6/VERSION new/yast2-3.1.7/VERSION --- old/yast2-3.1.6/VERSION 2013-11-28 13:57:35.000000000 +0100 +++ new/yast2-3.1.7/VERSION 2013-12-03 14:37:01.000000000 +0100 @@ -1 +1 @@ -3.1.6 +3.1.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.6/library/control/src/modules/ProductControl.rb new/yast2-3.1.7/library/control/src/modules/ProductControl.rb --- old/yast2-3.1.6/library/control/src/modules/ProductControl.rb 2013-11-28 13:57:35.000000000 +0100 +++ new/yast2-3.1.7/library/control/src/modules/ProductControl.rb 2013-12-03 14:37:01.000000000 +0100 @@ -129,8 +129,6 @@ @lastDisabledModules = deep_copy(@DisabledModules) - @installation_hooks = [] - ProductControl() end @@ -1388,17 +1386,13 @@ end end - before_hook_name = "before_#{step_name}" - before_hook = Hooks.run(before_hook_name) - @installation_hooks << before_hook + Hooks.run("before_#{step_name}") result = Convert.to_symbol( WFM.CallFunction(getClientName(step_name, step_execute), args) ) - after_hook_name = "after_#{step_name}" - after_hook = Hooks.run(after_hook_name) - @installation_hooks << after_hook + Hooks.run("after_#{step_name}") Builtins.y2milestone("Calling %1 returned %2", argterm, result) @@ -1550,17 +1544,6 @@ former_result = result end - failed_hooks = @installation_hooks.select {|hook| hook.failed? } - if !failed_hooks.empty? - Report.Error _("#{failed_hooks.size} installation hooks have failed: " + - "#{failed_hooks.map {|h| h.name}.join(', ')}") - #TODO - # show some structured widget for the user to see: - # * all run hooks - # * all succeeded hooks - # * all failed hooks with the error output - end - final_result = :abort if former_result == :abort Builtins.y2milestone( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.6/library/general/src/modules/Hooks.rb new/yast2-3.1.7/library/general/src/modules/Hooks.rb --- old/yast2-3.1.6/library/general/src/modules/Hooks.rb 2013-11-28 13:57:35.000000000 +0100 +++ new/yast2-3.1.7/library/general/src/modules/Hooks.rb 2013-12-03 14:37:01.000000000 +0100 @@ -61,6 +61,8 @@ attr_reader :hooks, :last, :search_path + private :hooks + def initialize textdomain 'base' @hooks = {} @@ -81,7 +83,7 @@ end def all - hooks + hooks.values end def exists? hook_name @@ -160,6 +162,10 @@ files.each &:execute end + def used? + !files.empty? + end + def results files.map &:result end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.6/library/general/test/hooks_test.rb new/yast2-3.1.7/library/general/test/hooks_test.rb --- old/yast2-3.1.6/library/general/test/hooks_test.rb 2013-11-28 13:57:35.000000000 +0100 +++ new/yast2-3.1.7/library/general/test/hooks_test.rb 2013-12-03 14:37:01.000000000 +0100 @@ -13,7 +13,7 @@ describe Hooks do before do - Hooks.all.clear + Hooks.send(:hooks).clear Hooks.search_path.set(TEST_HOOK_SEARCH_PATH) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.6/package/yast2.changes new/yast2-3.1.7/package/yast2.changes --- old/yast2-3.1.6/package/yast2.changes 2013-11-28 13:57:36.000000000 +0100 +++ new/yast2-3.1.7/package/yast2.changes 2013-12-03 14:37:02.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 3 13:34:50 UTC 2013 - [email protected] + +- Update hooks +- 3.1.7 + +------------------------------------------------------------------- Thu Nov 28 12:42:12 UTC 2013 - [email protected] - Add hook into installation workflow diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.6/package/yast2.spec new/yast2-3.1.7/package/yast2.spec --- old/yast2-3.1.6/package/yast2.spec 2013-11-28 13:57:36.000000000 +0100 +++ new/yast2-3.1.7/package/yast2.spec 2013-12-03 14:37:02.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
