Hello community,
here is the log from the commit of package yast2-packager for
openSUSE:Leap:15.2 checked in at 2020-03-13 10:55:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/yast2-packager (Old)
and /work/SRC/openSUSE:Leap:15.2/.yast2-packager.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager"
Fri Mar 13 10:55:26 2020 rev:140 rq:782208 version:4.2.58
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/yast2-packager/yast2-packager.changes
2020-03-02 17:21:24.374070180 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.yast2-packager.new.3160/yast2-packager.changes
2020-03-13 10:55:28.196353173 +0100
@@ -1,0 +2,40 @@
+Fri Mar 6 09:11:15 UTC 2020 - Ladislav Slezák <[email protected]>
+
+- Avoid unselecting the base product (related to bsc#1165501)
+- 4.2.58
+
+-------------------------------------------------------------------
+Thu Mar 5 16:21:35 UTC 2020 - José Iván López González <[email protected]>
+
+- Avoid to abort the installer when the user decides to not fix a
+ repository url (bsc#1163015).
+- 4.2.57
+
+-------------------------------------------------------------------
+Wed Mar 4 11:34:30 UTC 2020 - Josef Reidinger <[email protected]>
+
+- 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 <[email protected]>
+
+- 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 <[email protected]>
+
+- Do not crash when the list of preselected modules is not defined
+ (related to jsc#SLE-8040, jsc#SLE-11455).
+- 4.2.54
+
+-------------------------------------------------------------------
+Thu Feb 27 13:44:18 UTC 2020 - Ladislav Slezák <[email protected]>
+
+- Fixed going back (bsc#1163023)
+- 4.2.53
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-4.2.52.tar.bz2
New:
----
yast2-packager-4.2.58.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.BtL8h5/_old 2020-03-13 10:55:28.900353675 +0100
+++ /var/tmp/diff_new_pack.BtL8h5/_new 2020-03-13 10:55:28.908353681 +0100
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 4.2.52
+Version: 4.2.58
Release: 0
Summary: YaST2 - Package Library
License: GPL-2.0-or-later
++++++ yast2-packager-4.2.52.tar.bz2 -> yast2-packager-4.2.58.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-4.2.52/package/yast2-packager.changes
new/yast2-packager-4.2.58/package/yast2-packager.changes
--- old/yast2-packager-4.2.52/package/yast2-packager.changes 2020-02-25
10:55:11.000000000 +0100
+++ new/yast2-packager-4.2.58/package/yast2-packager.changes 2020-03-06
13:22:46.000000000 +0100
@@ -1,4 +1,44 @@
-------------------------------------------------------------------
+Fri Mar 6 09:11:15 UTC 2020 - Ladislav Slezák <[email protected]>
+
+- Avoid unselecting the base product (related to bsc#1165501)
+- 4.2.58
+
+-------------------------------------------------------------------
+Thu Mar 5 16:21:35 UTC 2020 - José Iván López González <[email protected]>
+
+- Avoid to abort the installer when the user decides to not fix a
+ repository url (bsc#1163015).
+- 4.2.57
+
+-------------------------------------------------------------------
+Wed Mar 4 11:34:30 UTC 2020 - Josef Reidinger <[email protected]>
+
+- 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 <[email protected]>
+
+- 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 <[email protected]>
+
+- Do not crash when the list of preselected modules is not defined
+ (related to jsc#SLE-8040, jsc#SLE-11455).
+- 4.2.54
+
+-------------------------------------------------------------------
+Thu Feb 27 13:44:18 UTC 2020 - Ladislav Slezák <[email protected]>
+
+- Fixed going back (bsc#1163023)
+- 4.2.53
+
+-------------------------------------------------------------------
Tue Feb 25 09:00:30 UTC 2020 - Ladislav Slezák <[email protected]>
- Preselect the default modules in the offline installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-4.2.52/package/yast2-packager.spec
new/yast2-packager-4.2.58/package/yast2-packager.spec
--- old/yast2-packager-4.2.52/package/yast2-packager.spec 2020-02-25
10:55:11.000000000 +0100
+++ new/yast2-packager-4.2.58/package/yast2-packager.spec 2020-03-06
13:22:46.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 4.2.52
+Version: 4.2.58
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.52/src/include/packager/repositories_include.rb
new/yast2-packager-4.2.58/src/include/packager/repositories_include.rb
--- old/yast2-packager-4.2.52/src/include/packager/repositories_include.rb
2020-02-25 10:55:11.000000000 +0100
+++ new/yast2-packager-4.2.58/src/include/packager/repositories_include.rb
2020-03-06 13:22:46.000000000 +0100
@@ -53,10 +53,12 @@
# with this alias already exists then it is overwritten, use empty
string ""
# to generate an unique alias
# @return [Symbol] the result
- # :ok => successfully added
- # :again => failed, but user wants to edit the URL and try again
+ # :ok => successfully added
+ # :again => failed, but user wants to edit the URL and try again
+ # :next => continue in the workflow
# :cancel => failed, don't retry
- # :abort => repository added successfully, but user rejected the license
+ # :abort => repository added successfully, but user rejected the license
+ #
# TODO: abort is problematic as abort is used to abort installation, for
license
# should be own symbol. Now abort in addon view in upgrade
proposal ask for abort
# properly, but then just go back to proposal instead of full
abort.
@@ -185,7 +187,7 @@
if newSources.empty?
log.error("Cannot add the repository")
- try_again(url, scheme) ? :again : :cancel
+ try_again(url, scheme) ? :again : :next
else
Progress.NextStage
Builtins.foreach(newSources) do |id|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.2.52/src/lib/y2packager/clients/inst_repositories_initialization.rb
new/yast2-packager-4.2.58/src/lib/y2packager/clients/inst_repositories_initialization.rb
---
old/yast2-packager-4.2.52/src/lib/y2packager/clients/inst_repositories_initialization.rb
2020-02-25 10:55:11.000000000 +0100
+++
new/yast2-packager-4.2.58/src/lib/y2packager/clients/inst_repositories_initialization.rb
2020-03-06 13:22:46.000000000 +0100
@@ -16,6 +16,7 @@
require "y2packager/self_update_addon_repo"
require "y2packager/medium_type"
+Yast.import "GetInstArgs"
Yast.import "Packages"
Yast.import "PackageCallbacks"
Yast.import "Popup"
@@ -37,6 +38,9 @@
def main
textdomain "packager"
+ # no changes if going back
+ return :back if Yast::GetInstArgs.going_back
+
if Y2Packager::MediumType.skip_step?
log.info "Skipping the client on the #{Y2Packager::MediumType.type}
medium"
return :auto
@@ -122,7 +126,7 @@
elsif products.size == 1
products.first.select
else
- products.each(&:restore)
+ products.each(&:restore) unless Y2Packager::MediumType.online?
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.2.52/src/lib/y2packager/dialogs/addon_selector.rb
new/yast2-packager-4.2.58/src/lib/y2packager/dialogs/addon_selector.rb
--- old/yast2-packager-4.2.52/src/lib/y2packager/dialogs/addon_selector.rb
2020-02-25 10:55:11.000000000 +0100
+++ new/yast2-packager-4.2.58/src/lib/y2packager/dialogs/addon_selector.rb
2020-03-06 13:22:46.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)
@@ -264,7 +264,7 @@
# @return [Array<Y2Packager::ProductLocation>] the products
def preselected_installation_products
default_modules = Yast::ProductFeatures.GetFeature("software",
"default_modules")
- return [] unless default_modules
+ return [] unless default_modules.is_a?(Array)
log.info("Defined default modules: #{default_modules.inspect}")
# skip the already selected products (to avoid duplicates)
@@ -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.52/src/modules/PackageSlideShow.rb
new/yast2-packager-4.2.58/src/modules/PackageSlideShow.rb
--- old/yast2-packager-4.2.52/src/modules/PackageSlideShow.rb 2020-02-25
10:55:11.000000000 +0100
+++ new/yast2-packager-4.2.58/src/modules/PackageSlideShow.rb 2020-03-06
13:22:46.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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.2.52/test/lib/clients/inst_repositories_initialization_test.rb
new/yast2-packager-4.2.58/test/lib/clients/inst_repositories_initialization_test.rb
---
old/yast2-packager-4.2.52/test/lib/clients/inst_repositories_initialization_test.rb
2020-02-25 10:55:11.000000000 +0100
+++
new/yast2-packager-4.2.58/test/lib/clients/inst_repositories_initialization_test.rb
2020-03-06 13:22:46.000000000 +0100
@@ -21,6 +21,7 @@
allow(Y2Packager::SelfUpdateAddonRepo).to
receive(:present?).and_return(false)
allow(Y2Packager::MediumType).to receive(:online?).and_return(false)
allow(Y2Packager::MediumType).to receive(:offline?).and_return(false)
+ allow(Yast::GetInstArgs).to receive(:going_back).and_return(false)
end
it "initializes Packages subsystem" do
@@ -44,6 +45,21 @@
client.main
end
+ context "going back" do
+ before do
+ allow(Yast::GetInstArgs).to receive(:going_back).and_return(true)
+ end
+
+ it "does not initialize Packages subsystem" do
+ expect(Yast::Packages).to_not receive(:InitializeCatalogs)
+ client.main
+ end
+
+ it "returns :back" do
+ expect(client.main).to eq(:back)
+ end
+ end
+
context "when initialization fails" do
let(:success) { false }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.2.52/test/repositories_include_test.rb
new/yast2-packager-4.2.58/test/repositories_include_test.rb
--- old/yast2-packager-4.2.52/test/repositories_include_test.rb 2020-02-25
10:55:11.000000000 +0100
+++ new/yast2-packager-4.2.58/test/repositories_include_test.rb 2020-03-06
13:22:46.000000000 +0100
@@ -91,6 +91,36 @@
end
end
+ context "when the repository cannot be created" do
+ before do
+ allow(Yast::Pkg).to receive(:RepositoryProbe).and_return(nil)
+ end
+
+ context "and the user accepts to edit the URL" do
+ before do
+ allow(Yast::Popup).to receive(:YesNo).and_return(true)
+ end
+
+ it "returns :again symbol" do
+ result = RepositoryIncludeTester.createSource(url, plaindir,
download, preffered_name)
+
+ expect(result).to eq(:again)
+ end
+ end
+
+ context "and the user does not accept to edit the URL" do
+ before do
+ allow(Yast::Popup).to receive(:YesNo).and_return(false)
+ end
+
+ it "returns :next symbol" do
+ result = RepositoryIncludeTester.createSource(url, plaindir,
download, preffered_name)
+
+ expect(result).to eq(:next)
+ end
+ end
+ end
+
it "creates the repository" do
repo_props = { "enabled" => true,
"autorefresh" => false,
