Skip to content
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.

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

Adapt to SCC API Change: 'base' -> 'isbase' [SLE-15-SP1] #591

Merged
merged 2 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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-registration.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 22 09:19:08 UTC 2023 - Stefan Hundhammer <shundhammer@suse.com>

- Adapted to SCC API change 'base' -> 'isbase' (bsc#1217317):
Cherry-picked igonzalezsosa's commit 431d937b78c209c0d35
- 4.1.28

-------------------------------------------------------------------
Wed Aug 2 08:44:51 UTC 2023 - Ladislav Slezák <lslezak@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-registration.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-registration
Version: 4.1.27
Version: 4.1.28
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down
2 changes: 1 addition & 1 deletion src/lib/registration/ui/migration_repos_workflow.rb
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ def store_repos_state

# update the $releasever
def update_releasever
new_base = selected_migration.find(&:base)
new_base = selected_migration.find(&:isbase)

if new_base
log.info "Activating new $releasever for base product: #{new_base}"
Expand Down
2 changes: 1 addition & 1 deletion src/lib/registration/ui/migration_selection_dialog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def migration_items

# @return [String] textual representation of base product living in arr
def base_product_text_for(arr)
base_product = arr.find(&:base)
base_product = arr.find(&:isbase)
base_product.friendly_name || base_product.short_name ||
(base_product.identifier + "-" + base_product.version)
end
Expand Down
20 changes: 10 additions & 10 deletions test/fixtures/migration_sles15_offline_migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:version: '15'
:arch: x86_64
:release_type:
:base: true
:isbase: true
:product_type: base
:free: false
:release_stage: beta
Expand All @@ -19,7 +19,7 @@
:version: '15'
:arch: x86_64
:release_type:
:base: false
:isbase: false
:product_type: module
:free: true
:release_stage: released
Expand All @@ -31,7 +31,7 @@
:version: '15'
:arch: x86_64
:release_type:
:base: false
:isbase: false
:product_type: module
:free: true
:release_stage: released
Expand All @@ -43,7 +43,7 @@
:version: '15'
:arch: x86_64
:release_type:
:base: false
:isbase: false
:product_type: module
:free: true
:release_stage: released
Expand All @@ -55,7 +55,7 @@
:version: '15'
:arch: x86_64
:release_type:
:base: false
:isbase: false
:product_type: module
:free: true
:release_stage: released
Expand All @@ -67,7 +67,7 @@
:version: '15'
:arch: x86_64
:release_type:
:base: false
:isbase: false
:product_type: module
:free: true
:release_stage: released
Expand All @@ -79,7 +79,7 @@
:version: '15'
:arch: x86_64
:release_type:
:base: false
:isbase: false
:product_type: module
:free: true
:release_stage: released
Expand All @@ -91,7 +91,7 @@
:version: '15'
:arch: x86_64
:release_type:
:base: false
:isbase: false
:product_type: module
:free: true
:release_stage: released
Expand All @@ -103,7 +103,7 @@
:version: '15'
:arch: x86_64
:release_type:
:base: false
:isbase: false
:product_type: module
:free: true
:release_stage: released
Expand All @@ -115,7 +115,7 @@
:version: '15'
:arch: x86_64
:release_type:
:base: false
:isbase: false
:product_type: module
:free: true
:release_stage: released
2 changes: 1 addition & 1 deletion test/fixtures/migration_to_sles12_sp1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
:release_type:
:friendly_name: SUSE Linux Enterprise Server SP1 x86_64
:shortname: SLES12-SP1
:base: true
:isbase: true
:product_type: base