Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2020-03-07 21:36:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Sat Mar 7 21:36:51 2020 rev:388 rq:781502 version:4.2.56 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2020-03-01 21:27:31.384496640 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new.26092/yast2-packager.changes 2020-03-07 21:36:54.120218002 +0100 @@ -1,0 +2,14 @@ +Wed Mar 4 11:34:30 UTC 2020 - Josef Reidinger <jreidin...@suse.com> + +- fix showing count of packages to install in slide show + (bsc#1161412) +- 4.2.56 + +------------------------------------------------------------------- +Fri Feb 28 17:11:05 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> + +- In the addon selector, display by default the information of the + first available product (related to bsc#1157780). +- 4.2.55 + +------------------------------------------------------------------- Old: ---- yast2-packager-4.2.54.tar.bz2 New: ---- yast2-packager-4.2.56.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.27H5WQ/_old 2020-03-07 21:36:54.784218450 +0100 +++ /var/tmp/diff_new_pack.27H5WQ/_new 2020-03-07 21:36:54.784218450 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.2.54 +Version: 4.2.56 Release: 0 Summary: YaST2 - Package Library License: GPL-2.0-or-later ++++++ yast2-packager-4.2.54.tar.bz2 -> yast2-packager-4.2.56.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.54/package/yast2-packager.changes new/yast2-packager-4.2.56/package/yast2-packager.changes --- old/yast2-packager-4.2.54/package/yast2-packager.changes 2020-02-28 18:09:47.000000000 +0100 +++ new/yast2-packager-4.2.56/package/yast2-packager.changes 2020-03-04 14:00:45.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Mar 4 11:34:30 UTC 2020 - Josef Reidinger <jreidin...@suse.com> + +- fix showing count of packages to install in slide show + (bsc#1161412) +- 4.2.56 + +------------------------------------------------------------------- +Fri Feb 28 17:11:05 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> + +- In the addon selector, display by default the information of the + first available product (related to bsc#1157780). +- 4.2.55 + +------------------------------------------------------------------- Fri Feb 28 16:53:10 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> - Do not crash when the list of preselected modules is not defined diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.54/package/yast2-packager.spec new/yast2-packager-4.2.56/package/yast2-packager.spec --- old/yast2-packager-4.2.54/package/yast2-packager.spec 2020-02-28 18:09:47.000000000 +0100 +++ new/yast2-packager-4.2.56/package/yast2-packager.spec 2020-03-04 14:00:45.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.2.54 +Version: 4.2.56 Release: 0 Summary: YaST2 - Package Library License: GPL-2.0-or-later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.54/src/lib/y2packager/dialogs/addon_selector.rb new/yast2-packager-4.2.56/src/lib/y2packager/dialogs/addon_selector.rb --- old/yast2-packager-4.2.54/src/lib/y2packager/dialogs/addon_selector.rb 2020-02-28 18:09:47.000000000 +0100 +++ new/yast2-packager-4.2.56/src/lib/y2packager/dialogs/addon_selector.rb 2020-03-04 14:00:45.000000000 +0100 @@ -83,9 +83,7 @@ # Handle changing the current item or changing the selection def addon_repos_handler - current_item = Yast::UI.QueryWidget(Id(:addon_repos), :CurrentItem) - current_product = products.find { |p| p.dir == current_item } - + current_product = find_current_product return unless current_product refresh_details(current_product) @@ -108,7 +106,7 @@ res = super Yast::Wizard.EnableNextButton Yast::Wizard.EnableBackButton - + Yast::UI.SetFocus(Id(:addon_repos)) res end @@ -206,16 +204,18 @@ # description widget # @return [Yast::Term] the addon details widget def details_widget - VWeight(40, RichText(Id(:details), Opt(:disabled), "<small>" + - description + "</small>")) + VWeight( + 40, + RichText(Id(:details), Opt(:disabled), initial_description) + ) end # extra help text - # @return [String] translated text - def description - # TRANSLATORS: inline help text displayed below the product selection widget - _("Select a product to see its description here. The dependent products " \ - "are selected automatically.") + # @return [String] first product description + def initial_description + return "" if products.empty? + + product_description(products.first) end def product_description(product) @@ -278,6 +278,14 @@ default_modules.include?(p.details&.product) end end + + # Returns the current product (the one which has the focus in the addons list) + # + # @return [Y2Packager::Product,nil] + def find_current_product + current_item = Yast::UI.QueryWidget(Id(:addon_repos), :CurrentItem) + products.find { |p| p.dir == current_item } + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.54/src/modules/PackageSlideShow.rb new/yast2-packager-4.2.56/src/modules/PackageSlideShow.rb --- old/yast2-packager-4.2.54/src/modules/PackageSlideShow.rb 2020-02-28 18:09:47.000000000 +0100 +++ new/yast2-packager-4.2.56/src/modules/PackageSlideShow.rb 2020-03-04 14:00:45.000000000 +0100 @@ -700,45 +700,39 @@ # Now go through all repositories # - src_no = 0 - - @remaining_sizes_per_cd_per_src.each do |inst_src| + @remaining_sizes_per_cd_per_src.each_with_index do |inst_src, src_no| log.info "src ##{src_no}: #{inst_src}" # Ignore repositories from where there is nothing is to install next if ListSum(inst_src) < 1 - cd_no = 0 + inst_src.each_with_index do |src_remaining, cd_no| + next unless src_remaining > 0 || + (src_no + 1) == @current_src_no && + (cd_no + 1) == @current_cd_no # suppress current CD + + caption = @inst_src_names[src_no] || _("Unknown Source") + # add "Medium 1" only if more cds available (bsc#1158498) + caption += @media_type + (cd_no + 1).to_s unless @last_cd + rem_size = FormatRemainingSize(src_remaining) # column #1 + rem_count = FormatRemainingCount( + @remaining_pkg_count_per_cd_per_src.dig(src_no, cd_no) || 0 + ) + rem_time = HOURGLASS + + if show_remaining_time? && @bytes_per_second > 0 + src_remaining /= @bytes_per_second + rem_time = FormatTimeShowOverflow(src_remaining) # column #2 + end - inst_src.each do |src_remaining| - if src_remaining > 0 || - (src_no + 1) == @current_src_no && - (cd_no + 1) == @current_cd_no # suppress current CD - caption = @inst_src_names[src_no] || _("Unknown Source") - # add "Medium 1" only if more cds available (bsc#1158498) - caption += @media_type + (cd_no + 1).to_s unless @last_cd - rem_size = FormatRemainingSize(src_remaining) # column #1 - rem_count = FormatRemainingCount( - @remaining_pkg_count_per_cd_per_src.dig(src_no, cd_no) || 0 + itemList << + SlideShow.TableItem( + "cd(#{src_no},#{cd_no})", # ID + caption, + ITEM_PREFIX + rem_size, + ITEM_PREFIX + rem_count, + ITEM_PREFIX + rem_time ) - rem_time = HOURGLASS - - if show_remaining_time? && @bytes_per_second > 0 - src_remaining /= @bytes_per_second - rem_time = FormatTimeShowOverflow(src_remaining) # column #2 - end - - itemList << - SlideShow.TableItem( - "cd(#{src_no},#{cd_no})", # ID - caption, - ITEM_PREFIX + rem_size, - ITEM_PREFIX + rem_count, - ITEM_PREFIX + rem_time - ) - end - cd_no += 1 end - src_no += 1 end itemList