Skip to content

Fixed regression in the add-on repository names (bsc#1175374) #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2020
Merged

Fixed regression in the add-on repository names (bsc#1175374) #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb4cc37
Fixed regression in the add-on repository names (bsc#1175374)
lslezak Sep 3, 2020
955010f
Updated documentation comment
lslezak Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions package/yast2-add-on.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 3 07:11:47 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>

- Fixed regression in the add-on repository names in AutoYaST
installation (bsc#1175374, related to bsc#1172477)
- 4.2.16

-------------------------------------------------------------------
Tue Jan 28 09:30:52 CET 2020 - schubi@suse.de

Expand Down
4 changes: 3 additions & 1 deletion package/yast2-add-on.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-add-on
Version: 4.2.15
Version: 4.2.16
Release: 0
Summary: YaST2 - Add-On media installation code
License: GPL-2.0-only
Expand All @@ -41,6 +41,8 @@ Requires: yast2-country
Requires: yast2-installation
# Packager ProductLicense#HandleLicenseDialogRet allowing "refuse" action
Requires: yast2-packager >= 4.2.16
# "raw_name" in Pkg.SourceEditGet/Set()
Requires: yast2-pkg-bindings >= 4.2.8
Requires: yast2-ruby-bindings >= 1.0.0

Obsoletes: yast2-add-on-devel-doc
Expand Down
8 changes: 4 additions & 4 deletions src/lib/add-on/clients/add-on_auto.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,10 @@ def adjust_source_attributes(add_on, source_id)

return if repo.nil?

repo["name"] = preferred_name_for(add_on, repo)
repo["raw_name"] = preferred_name_for(add_on, repo)
repo["priority"] = add_on["priority"] if add_on.key?("priority")

log.info("Preferred name: #{repo["name"]}")
log.info("Preferred name: #{repo["raw_name"]}")

Pkg.SourceEditSet(sources)
end
Expand All @@ -326,7 +326,7 @@ def adjust_source_attributes(add_on, source_id)
# * name of given repo
#
# @param [Hash] addon
# @param [Array] repo
# @param [Hash] repo
#
# @return [String] preferred name for add-on/repo
def preferred_name_for(add_on, repo)
Expand All @@ -344,7 +344,7 @@ def preferred_name_for(add_on, repo)
found_repo = repos_at_url.find { |r| r[1] == product_dir }
return found_repo[0] if found_repo

repo["name"]
repo["raw_name"]
end

# Installs given product
Expand Down
3 changes: 2 additions & 1 deletion test/y2add_on/clients/add-on_auto_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@
"autorefresh" => true,
"enabled" => true,
"keeppackaged" => false,
"name" => "Updated repo",
"name" => "repo_to_be_updated",
"raw_name" => "Updated repo",
"priority" => 20,
"service" => ""
},
Expand Down