Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2021-08-26 23:14:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on" Thu Aug 26 23:14:18 2021 rev:114 rq:913966 version:4.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2021-05-02 18:36:04.356958910 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new.1899/yast2-add-on.changes 2021-08-26 23:14:31.452262180 +0200 @@ -1,0 +2,7 @@ +Thu Aug 19 16:00:54 UTC 2021 - David Diaz <[email protected]> + +- Improve UX by using a less misleading message when + repo URL is unknown (bsc#1188635). +- 4.4.1 + +------------------------------------------------------------------- Old: ---- yast2-add-on-4.4.0.tar.bz2 New: ---- yast2-add-on-4.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.qvS8Tb/_old 2021-08-26 23:14:32.068261634 +0200 +++ /var/tmp/diff_new_pack.qvS8Tb/_new 2021-08-26 23:14:32.072261631 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.4.0 +Version: 4.4.1 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only ++++++ yast2-add-on-4.4.0.tar.bz2 -> yast2-add-on-4.4.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.4.0/package/yast2-add-on.changes new/yast2-add-on-4.4.1/package/yast2-add-on.changes --- old/yast2-add-on-4.4.0/package/yast2-add-on.changes 2021-04-30 18:12:57.000000000 +0200 +++ new/yast2-add-on-4.4.1/package/yast2-add-on.changes 2021-08-24 11:03:20.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 19 16:00:54 UTC 2021 - David Diaz <[email protected]> + +- Improve UX by using a less misleading message when + repo URL is unknown (bsc#1188635). +- 4.4.1 + +------------------------------------------------------------------- Tue Apr 20 12:55:53 UTC 2021 - Ladislav Slez??k <[email protected]> - 4.4.0 (bsc#1185510) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.4.0/package/yast2-add-on.spec new/yast2-add-on-4.4.1/package/yast2-add-on.spec --- old/yast2-add-on-4.4.0/package/yast2-add-on.spec 2021-04-30 18:12:57.000000000 +0200 +++ new/yast2-add-on-4.4.1/package/yast2-add-on.spec 2021-08-24 11:03:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.4.0 +Version: 4.4.1 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.4.0/src/include/add-on/add-on-workflow.rb new/yast2-add-on-4.4.1/src/include/add-on/add-on-workflow.rb --- old/yast2-add-on-4.4.0/src/include/add-on/add-on-workflow.rb 2021-04-30 18:12:57.000000000 +0200 +++ new/yast2-add-on-4.4.1/src/include/add-on/add-on-workflow.rb 2021-08-24 11:03:20.000000000 +0200 @@ -1171,49 +1171,29 @@ end def AdjustInfoWidget - pi = ReturnCurrentlySelectedProductInfo() - if pi.nil? || pi == {} + product_info = ReturnCurrentlySelectedProductInfo() + + if product_info.to_h.empty? UI.ChangeWidget(Id("product_details"), :Value, "") + return end - vendor = pi["product"].vendor.empty? ? _("Unknown vendor") : pi["product"].vendor - version = pi["product"].version.empty? ? _("Unknown version") : pi["product"].version - rt_description = Builtins.sformat( - "<p>%1\n%2\n%3\n%4</p>", - Builtins.sformat( - _("<b>Vendor:</b> %1<br>"), - vendor - ), - Builtins.sformat( - _("<b>Version:</b> %1<br>"), - version - ), - Builtins.sformat( - _("<b>Repository URL:</b> %1<br>"), - if Ops.greater_than( - Builtins.size(Ops.get_list(pi, ["info", "URLs"], [])), - 0 - ) - Builtins.mergestring(Ops.get_list(pi, ["info", "URLs"], []), ",") - else - _("Unknown repository URL") - end - ), - if Ops.greater_than( - Builtins.size(Ops.get_list(pi, ["info", "aliases"], [])), - 0 - ) - Builtins.sformat( - _("<b>Repository Alias:</b> %1<br>"), - Builtins.mergestring(Ops.get_list(pi, ["info", "aliases"], []), ",") - ) - else - "" - end - ) + product = product_info["product"] + info = product_info["info"] || {} + + vendor = product.vendor.empty? ? _("Unknown vendor") : product.vendor + version = product.version.empty? ? _("unknown version") : product.version + urls = info.fetch("URLs", []).join(",") + aliases = info.fetch("aliases", []).join(",") + + details = [] + details << format(_("<b>Vendor:</b> %s<br>"), vendor) + details << format(_("<b>Version:</b> %s<br>"), version) + details << format(_("<b>Repository URL:</b> %s<br>"), urls) unless urls.empty? + details << format(_("<b>Repository Alias:</b> %s<br>"), aliases) unless aliases.empty? - UI.ChangeWidget(Id("product_details"), :Value, rt_description) + UI.ChangeWidget(Id("product_details"), :Value, "<p>#{details.join("\n")}</p>") nil end @@ -1431,9 +1411,14 @@ log.info("Currently used add-ons: #{product_infos}") products = product_infos.map do |index, product_desc| - Item(Id("product_#{index}"), + # TRANSLATORS: Product status, the installed product was not found in any enabled repository + url = product_desc["info"]["URLs"].first || _("Not found in enabled repositories") + + Item( + Id("product_#{index}"), ui_product_name(product_desc["product"]), - product_desc["info"]["URLs"].first || _("Unknown URL")) + url + ) end UI.ChangeWidget(Id("list_of_addons"), :Items, products)
