Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2014-05-17 22:01:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-23 15:58:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2014-05-17 22:01:56.000000000 +0200 @@ -1,0 +2,13 @@ +Thu May 15 14:19:52 UTC 2014 - [email protected] + +- fixed going back in URL type dialog +- 3.1.4 + +------------------------------------------------------------------- +Tue May 13 18:26:16 UTC 2014 - [email protected] + +- handle the global enable/disable checkbox in the URL type dialog + (bnc#870625) +- 3.1.3 + +------------------------------------------------------------------- Old: ---- yast2-add-on-3.1.2.tar.bz2 New: ---- yast2-add-on-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.QNUm4d/_old 2014-05-17 22:01:57.000000000 +0200 +++ /var/tmp/diff_new_pack.QNUm4d/_new 2014-05-17 22:01:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.2 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,8 +29,8 @@ Requires: yast2-country Requires: yast2-installation -# AddOnProduct::SetRepoUrlAlias() -Requires: yast2-packager >= 2.23.1 +# SourceDialogs.display_addon_checkbox +Requires: yast2-packager >= 3.1.14 # bugzilla #335582, new API for StorageDevices Requires: yast2-storage >= 2.16.1 ++++++ yast2-add-on-3.1.2.tar.bz2 -> yast2-add-on-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.2/package/yast2-add-on.changes new/yast2-add-on-3.1.4/package/yast2-add-on.changes --- old/yast2-add-on-3.1.2/package/yast2-add-on.changes 2014-01-17 16:46:17.000000000 +0100 +++ new/yast2-add-on-3.1.4/package/yast2-add-on.changes 2014-05-15 16:26:44.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu May 15 14:19:52 UTC 2014 - [email protected] + +- fixed going back in URL type dialog +- 3.1.4 + +------------------------------------------------------------------- +Tue May 13 18:26:16 UTC 2014 - [email protected] + +- handle the global enable/disable checkbox in the URL type dialog + (bnc#870625) +- 3.1.3 + +------------------------------------------------------------------- Fri Jan 17 15:42:12 UTC 2014 - [email protected] - Fix autoyast config file issue BNC#846011 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.2/package/yast2-add-on.spec new/yast2-add-on-3.1.4/package/yast2-add-on.spec --- old/yast2-add-on-3.1.2/package/yast2-add-on.spec 2014-01-17 16:46:17.000000000 +0100 +++ new/yast2-add-on-3.1.4/package/yast2-add-on.spec 2014-05-15 16:26:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.2 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,8 +32,8 @@ Requires: yast2-installation Requires: yast2-country -# AddOnProduct::SetRepoUrlAlias() -Requires: yast2-packager >= 2.23.1 +# SourceDialogs.display_addon_checkbox +Requires: yast2-packager >= 3.1.14 # bugzilla #335582, new API for StorageDevices Requires: yast2-storage >= 2.16.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.2/src/include/add-on/add-on-workflow.rb new/yast2-add-on-3.1.4/src/include/add-on/add-on-workflow.rb --- old/yast2-add-on-3.1.2/src/include/add-on/add-on-workflow.rb 2014-01-14 11:05:27.000000000 +0100 +++ new/yast2-add-on-3.1.4/src/include/add-on/add-on-workflow.rb 2014-05-15 16:26:44.000000000 +0200 @@ -16,6 +16,8 @@ # module Yast module AddOnAddOnWorkflowInclude + include Yast::Logger + def initialize_add_on_add_on_workflow(include_target) Yast.import "UI" Yast.import "Pkg" @@ -87,7 +89,7 @@ if Ops.get_string(cmd_run, "stdout", "") != "" Builtins.y2error("Checking the network failed") ret = true - end + end # some devices are listed elsif Ops.get_string(cmd_run, "stdout", "") != nil && Ops.get_string(cmd_run, "stdout", "") != "" && @@ -172,12 +174,23 @@ # Run dialog for selecting the media # @return [Symbol] for wizard sequencer def MediaSelect - aliases = { "type" => lambda { TypeDialog() }, "edit" => lambda do - EditDialog() - end, "store" => lambda( - ) do - StoreSource() - end } + aliases = { + "type" => lambda do + ret = TypeDialog() + log.debug "SourceDialogs.addon_enabled: #{SourceDialogs.addon_enabled}" + # explicitly check for false (nil means the checkbox was not displayed) + ret = :skip if ret == :next && SourceDialogs.addon_enabled == false + log.debug "TypeDialog result: #{ret}" + ret + end, + "edit" => lambda { EditDialog() }, + "store" => lambda do + StoreSource() + # the enabled/disabled checkbox is displayed only once + # (for the first repository) + SourceDialogs.display_addon_checkbox = false + end + } sources_before = Pkg.SourceGetCurrent(false) Builtins.y2milestone("Sources before adding new one: %1", sources_before) @@ -188,7 +201,8 @@ :next => "edit", # bnc #392083 :finish => "store", - :abort => :abort + :abort => :abort, + :skip => :skip }, "edit" => { :next => "store", @@ -206,8 +220,9 @@ Builtins.y2milestone("Starting repository sequence") ret = Sequencer.Run(aliases, sequence) + log.info "Repository sequence result: #{ret}" - if ret != :abort + if ret == :next sources_after = Pkg.SourceGetCurrent(false) Builtins.y2milestone("Sources with new one added: %1", sources_after) @@ -850,7 +865,8 @@ "media" => { :abort => :abort, :next => "check_compliance", - :finish => "check_compliance" + :finish => "check_compliance", + :skip => :skip }, # "catalog" : $[ # `abort : `abort, @@ -1084,11 +1100,7 @@ some_addon_changed = false begin # FATE #301928 - Saving one click - if ret == :first_time - ret = :add - else - ret = Convert.to_symbol(UI.UserInput) - end + ret = Convert.to_symbol(UI.UserInput) unless ret == :first_time # aborting if ret == :abort || ret == :cancel @@ -1099,11 +1111,11 @@ break else ret = nil - end + end # Running system else break - end + end # removing add-on elsif ret == :delete @@ -1134,10 +1146,10 @@ back_button, next_button, abort_button - ) + ) # adding new add-on - elsif ret == :add + elsif ret == :add || ret == :first_time # bugzilla #293428 # Release all sources before adding a new one # because of CD/DVD + url cd:// @@ -1151,6 +1163,8 @@ ret2 = RunWizard() Wizard.CloseDialog + log.info "Subworkflow result: ret2: #{ret2}" + if ret2 == :next # Add-On product has been added, integrate it (change workflow, use y2update) AddOnProduct.Integrate(AddOnProduct.src_id) @@ -1177,6 +1191,10 @@ AddOnProduct.src_id end end + # extra handling for the global enable checkbox + elsif ret == :first_time + ret = :back if ret2 == :back + ret = :next if ret2 == :skip end Redraw( @@ -1906,13 +1924,13 @@ if userret == :abort || userret == :cancel Builtins.y2warning("Aborting...") ret = :abort - break + break # Closing elsif userret == :next || userret == :finish Builtins.y2milestone("Finishing...") ret = :next - break + break # Addin new product elsif userret == :add @@ -1928,7 +1946,7 @@ end CreateAddOnsOverviewDialog() - RedrawAddOnsOverviewTable() + RedrawAddOnsOverviewTable() # Removing product elsif userret == :delete @@ -1942,7 +1960,7 @@ Builtins.y2milestone( "User decided not to remove the selected product" ) - next + next # false == user decided not confirm the add-on removal # libzypp has been already changed @@ -1956,7 +1974,7 @@ NeutralizeAllResolvables() Pkg.SourceFinishAll - LoadLibzyppNow() + LoadLibzyppNow() # true == packages and sources have been removed else @@ -1965,11 +1983,11 @@ end CreateAddOnsOverviewDialog() - RedrawAddOnsOverviewTable() + RedrawAddOnsOverviewTable() # Redrawing info widget elsif userret == "list_of_addons" - AdjustInfoWidget() + AdjustInfoWidget() # Calling packager directly elsif userret == :packager @@ -1977,7 +1995,7 @@ RunPackageSelector() CreateAddOnsOverviewDialog() - RedrawAddOnsOverviewTable() + RedrawAddOnsOverviewTable() # Everything else else -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
