Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2014-09-02 08:22:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2014-06-26 08:00:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2014-09-02 08:22:20.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 1 09:09:40 UTC 2014 - [email protected] + +- make add-ons dialog consistent when going back (bnc#893103) +- 3.1.9 + +------------------------------------------------------------------- Old: ---- yast2-add-on-3.1.8.tar.bz2 New: ---- yast2-add-on-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.5m1sk4/_old 2014-09-02 08:22:21.000000000 +0200 +++ /var/tmp/diff_new_pack.5m1sk4/_new 2014-09-02 08:22:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-add-on-3.1.8.tar.bz2 -> yast2-add-on-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.8/package/yast2-add-on.changes new/yast2-add-on-3.1.9/package/yast2-add-on.changes --- old/yast2-add-on-3.1.8/package/yast2-add-on.changes 2014-06-02 19:01:29.000000000 +0200 +++ new/yast2-add-on-3.1.9/package/yast2-add-on.changes 2014-09-01 11:31:08.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 1 09:09:40 UTC 2014 - [email protected] + +- make add-ons dialog consistent when going back (bnc#893103) +- 3.1.9 + +------------------------------------------------------------------- Mon Jun 2 16:49:24 UTC 2014 - [email protected] - always set correct state for add-on add checkbox dialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.8/package/yast2-add-on.spec new/yast2-add-on-3.1.9/package/yast2-add-on.spec --- old/yast2-add-on-3.1.8/package/yast2-add-on.spec 2014-06-02 19:01:29.000000000 +0200 +++ new/yast2-add-on-3.1.9/package/yast2-add-on.spec 2014-09-01 11:31:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.8/src/include/add-on/add-on-workflow.rb new/yast2-add-on-3.1.9/src/include/add-on/add-on-workflow.rb --- old/yast2-add-on-3.1.8/src/include/add-on/add-on-workflow.rb 2014-06-02 19:01:29.000000000 +0200 +++ new/yast2-add-on-3.1.9/src/include/add-on/add-on-workflow.rb 2014-09-01 11:31:08.000000000 +0200 @@ -48,8 +48,6 @@ Yast.include include_target, "packager/repositories_include.rb" Yast.include include_target, "add-on/misc.rb" - @going_back_in_workflow = GetInstArgs.going_back - # Used for adding sources @createResult = :again @@ -1072,12 +1070,10 @@ end # FATE #301928 - Saving one click - # Bugzilla #305809 if "going_back", do not save that click! - if no_addons && !@going_back_in_workflow + # Bugzilla #893103 be consistent, so always when there is no add-on skip + if no_addons Builtins.y2milestone("Skipping to media_select") - # only once - @going_back_in_workflow = false - ret = :first_time + ret = :skip_to_add end # Show Add-Ons table @@ -1097,7 +1093,7 @@ some_addon_changed = false begin # FATE #301928 - Saving one click - ret = Convert.to_symbol(UI.UserInput) unless ret == :first_time + ret = Convert.to_symbol(UI.UserInput) unless ret == :skip_to_add # aborting if ret == :abort || ret == :cancel @@ -1146,11 +1142,11 @@ ) # adding new add-on - elsif ret == :add || ret == :first_time + elsif ret == :add || ret == :skip_to_add # show checkbox only first time in installation when there is no # other addons, so allow to quickly skip adding addons, otherwise # it make no sense as user explicitelly want add addon - SourceDialogs.display_addon_checkbox = ret == :first_time + SourceDialogs.display_addon_checkbox = ret == :skip_to_add # bugzilla #293428 # Release all sources before adding a new one @@ -1175,7 +1171,7 @@ AddOnProduct.PrepareForRegistration(AddOnProduct.src_id) some_addon_changed = true # do not keep first_time, otherwise summary won't be shown during installation - ret = nil if ret == :first_time + ret = nil if ret == :skip_to_add elsif ret2 == :abort || ret2 == :cancel Builtins.y2milestone("Add-on sequence aborted") @@ -1196,9 +1192,9 @@ end end # properly return abort in installation - ret = :abort if ret == :first_time + ret = :abort if ret == :skip_to_add # extra handling for the global enable checkbox - elsif ret == :first_time + elsif ret == :skip_to_add ret = :back if ret2 == :back ret = :next if ret2 == :skip end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
