Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2017-10-07 17:48:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on" Sat Oct 7 17:48:57 2017 rev:83 rq:528045 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2017-08-02 11:26:36.603394830 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2017-10-07 17:48:59.231730814 +0200 @@ -1,0 +2,13 @@ +Wed Sep 20 16:46:37 UTC 2017 - [email protected] + +- Display also the repository path in the URL column if it is + defined (fate#323886) +- 4.0.0 + +------------------------------------------------------------------- +Wed Aug 16 08:59:30 UTC 2017 - [email protected] + +- Removed support for floppy (fate#319096) +- 3.3.1 + +------------------------------------------------------------------- Old: ---- yast2-add-on-3.3.0.tar.bz2 New: ---- yast2-add-on-4.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.rRQDZk/_old 2017-10-07 17:48:59.823704791 +0200 +++ /var/tmp/diff_new_pack.rRQDZk/_new 2017-10-07 17:48:59.827704616 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.3.0 +Version: 4.0.0 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0 @@ -36,8 +36,6 @@ # SourceDialogs.display_addon_checkbox Requires: yast2-packager >= 3.1.14 Requires: yast2-ruby-bindings >= 1.0.0 -# bugzilla #335582, new API for StorageDevices -Requires: yast2-storage >= 2.16.1 Obsoletes: yast2-add-on-devel-doc ++++++ yast2-add-on-3.3.0.tar.bz2 -> yast2-add-on-4.0.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.3.0/package/yast2-add-on.changes new/yast2-add-on-4.0.0/package/yast2-add-on.changes --- old/yast2-add-on-3.3.0/package/yast2-add-on.changes 2017-07-27 15:50:20.483056797 +0200 +++ new/yast2-add-on-4.0.0/package/yast2-add-on.changes 2017-09-21 14:03:53.926982072 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Sep 20 16:46:37 UTC 2017 - [email protected] + +- Display also the repository path in the URL column if it is + defined (fate#323886) +- 4.0.0 + +------------------------------------------------------------------- +Wed Aug 16 08:59:30 UTC 2017 - [email protected] + +- Removed support for floppy (fate#319096) +- 3.3.1 + +------------------------------------------------------------------- Thu Jul 27 08:44:31 UTC 2017 - [email protected] - drop inst_lang_addon client because openSUSE Lang Addon is also diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.3.0/package/yast2-add-on.spec new/yast2-add-on-4.0.0/package/yast2-add-on.spec --- old/yast2-add-on-3.3.0/package/yast2-add-on.spec 2017-07-27 15:50:20.483056797 +0200 +++ new/yast2-add-on-4.0.0/package/yast2-add-on.spec 2017-09-21 14:03:53.926982072 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.3.0 +Version: 4.0.0 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0 @@ -36,8 +36,6 @@ # SourceDialogs.display_addon_checkbox Requires: yast2-packager >= 3.1.14 Requires: yast2-ruby-bindings >= 1.0.0 -# bugzilla #335582, new API for StorageDevices -Requires: yast2-storage >= 2.16.1 Obsoletes: yast2-add-on-devel-doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.3.0/src/clients/vendor.rb new/yast2-add-on-4.0.0/src/clients/vendor.rb --- old/yast2-add-on-3.3.0/src/clients/vendor.rb 2017-07-27 15:50:20.527056797 +0200 +++ new/yast2-add-on-4.0.0/src/clients/vendor.rb 2017-09-21 14:03:53.934982072 +0200 @@ -17,7 +17,6 @@ Yast.import "Installation" Yast.import "Label" Yast.import "Popup" - Yast.import "StorageDevices" Yast.import "Wizard" Yast.import "GetInstArgs" Yast.import "Mode" @@ -45,7 +44,6 @@ @arg_n = Ops.subtract(Builtins.size(WFM.Args), 1) @default_device = "/dev/cdrom" - @alternate_device = StorageDevices.FloppyDevice while Ops.greater_or_equal(@arg_n, 0) if Builtins.substring(Convert.to_string(WFM.Args(@arg_n)), 0, 1) == "/" @@ -73,13 +71,6 @@ path(".target.mount"), [@default_device, Installation.sourcedir] ) == false - if @alternate_device != @default_device && - SCR.Execute( - path(".target.mount"), - [@alternate_device, Installation.sourcedir] - ) == true - break - end # VENDOR: cant mount /dev/cdrom popup if !Popup.ContinueCancel(_("Please insert the vendor CD-ROM")) UI.CloseDialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.3.0/src/include/add-on/add-on-workflow.rb new/yast2-add-on-4.0.0/src/include/add-on/add-on-workflow.rb --- old/yast2-add-on-3.3.0/src/include/add-on/add-on-workflow.rb 2017-07-27 15:50:20.531056797 +0200 +++ new/yast2-add-on-4.0.0/src/include/add-on/add-on-workflow.rb 2017-09-21 14:03:53.934982072 +0200 @@ -1390,11 +1390,13 @@ end source_data = Pkg.SourceGeneralData(one_repo) if source_data != nil && Builtins.haskey(source_data, "base_urls") - Ops.set( - info.value, - "URLs", - Ops.get_list(source_data, "base_urls", []) - ) + urls = source_data["base_urls"] + # Add the product directory if it is present + if ![nil, "", "/"].include?(source_data["product_dir"]) + urls.map! { |u| "#{u} (#{source_data["product_dir"]})" } + end + + Ops.set(info.value, "URLs", urls) else Builtins.y2error("No URLs for repo ID %1", one_repo) end @@ -1612,34 +1614,13 @@ end def RedrawAddOnsOverviewTable - products = [] - - product_infos = Convert.convert( - GetProductInfos(), - :from => "map", - :to => "map <string, map>" - ) + product_infos = GetProductInfos() || {} + log.info("Currently used add-ons: #{product_infos}") - product_infos = {} if product_infos == nil - - Builtins.y2milestone("Currently used add-ons: %1", product_infos) - - Builtins.foreach(product_infos) do |index, product_desc| - products = Builtins.add( - products, - Item( - Id(Builtins.sformat("product_%1", index)), - Ops.get_locale( - product_desc, - ["product", "display_name"], - Ops.get_locale( - product_desc, - ["product", "name"], - _("Unknown product") - ) - ), - Ops.get_locale(product_desc, ["info", "URLs", 0], _("Unknown URL")) - ) + products = product_infos.map do |index, product_desc| + Item(Id("product_#{index}"), + product_desc["product"]["display_name"] || product_desc["product"]["name"] || _("Unknown product"), + product_desc["info"]["URLs"].first || _("Unknown URL") ) end @@ -1647,13 +1628,7 @@ AdjustInfoWidget() # Nothing to do delete when there are no product listed - UI.ChangeWidget( - Id(:delete), - :Enabled, - Ops.greater_than(Builtins.size(products), 0) - ) - - nil + UI.ChangeWidget(Id(:delete), :Enabled, !products.empty?) end def RunPackageSelector
