Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2019-10-03 14:06:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on" Thu Oct 3 14:06:13 2019 rev:101 rq:734110 version:4.2.7 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2019-08-30 14:40:07.505432443 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new.2352/yast2-add-on.changes 2019-10-03 14:06:17.112590225 +0200 @@ -1,0 +2,7 @@ +Mon Sep 30 07:50:24 UTC 2019 - Ladislav Slezák <[email protected]> + +- Automatically offer the modules and extensions in the offline + media installation (jsc#SLE-7101) +- 4.2.7 + +------------------------------------------------------------------- Old: ---- yast2-add-on-4.2.6.tar.bz2 New: ---- yast2-add-on-4.2.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.v2h5bv/_old 2019-10-03 14:06:17.708588692 +0200 +++ /var/tmp/diff_new_pack.v2h5bv/_new 2019-10-03 14:06:17.712588682 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.2.6 +Version: 4.2.7 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only ++++++ yast2-add-on-4.2.6.tar.bz2 -> yast2-add-on-4.2.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.2.6/package/yast2-add-on.changes new/yast2-add-on-4.2.7/package/yast2-add-on.changes --- old/yast2-add-on-4.2.6/package/yast2-add-on.changes 2019-08-28 13:14:18.000000000 +0200 +++ new/yast2-add-on-4.2.7/package/yast2-add-on.changes 2019-09-30 16:37:54.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 30 07:50:24 UTC 2019 - Ladislav Slezák <[email protected]> + +- Automatically offer the modules and extensions in the offline + media installation (jsc#SLE-7101) +- 4.2.7 + +------------------------------------------------------------------- Wed Aug 28 13:06:58 CEST 2019 - [email protected] - Removed empty entry in desktop file (bsc#144894). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.2.6/package/yast2-add-on.spec new/yast2-add-on-4.2.7/package/yast2-add-on.spec --- old/yast2-add-on-4.2.6/package/yast2-add-on.spec 2019-08-28 13:14:18.000000000 +0200 +++ new/yast2-add-on-4.2.7/package/yast2-add-on.spec 2019-09-30 16:37:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.2.6 +Version: 4.2.7 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.2.6/src/include/add-on/add-on-workflow.rb new/yast2-add-on-4.2.7/src/include/add-on/add-on-workflow.rb --- old/yast2-add-on-4.2.6/src/include/add-on/add-on-workflow.rb 2019-08-28 13:14:18.000000000 +0200 +++ new/yast2-add-on-4.2.7/src/include/add-on/add-on-workflow.rb 2019-09-30 16:37:54.000000000 +0200 @@ -14,6 +14,9 @@ # Lukas Ocilka <[email protected]> # # + +require "y2packager/medium_type" + module Yast module AddOnAddOnWorkflowInclude include Yast::Logger @@ -27,10 +30,12 @@ Yast.import "AddOnProduct" Yast.import "WorkflowManager" Yast.import "Linuxrc" + Yast.import "InstURL" Yast.import "Mode" Yast.import "Popup" Yast.import "Report" Yast.import "Sequencer" + Yast.import "SourceDialogs" Yast.import "SourceManager" Yast.import "PackageSystem" Yast.import "ProductProfile" @@ -108,17 +113,7 @@ # @return [Symbol] for wizard sequencer def MediaSelect aliases = { - "type" => lambda do - # use the preselected type or the same type as for the previous add-on, - # if not set it will use the default (the code actually runs - # SourceDialogs.SetURL(SourceDialogs.GetURL) internally) - ret = TypeDialogOpts(true, SourceDialogs.GetURL) - 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, + "type" => lambda { media_type_selection }, "edit" => lambda { EditDialog() }, "store" => lambda do StoreSource() @@ -1907,5 +1902,27 @@ Pkg.SourceSaveAll end end + + # Display the media type selection dialog, in the offline mode it is skipped + # when no addon is selected. + # + # @return [Symbol] the workflow symbol (:next, :back, ...) + def media_type_selection + if AddOnProduct.add_on_products.empty? && Y2Packager::MediumType.offline? + # preselect the installation repository without asking the user + # for the URL when adding an add-on first time on the offline medium + SourceDialogs.SetURL(InstURL.installInf2Url("")) + return :finish + end + # use the preselected type or the same type as for the previous add-on, + # if not set it will use the default (the code actually runs + # SourceDialogs.SetURL(SourceDialogs.GetURL) internally) + ret = TypeDialogOpts(true, SourceDialogs.GetURL) + 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 end end
