diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes index cb0e2376..4f553983 100644 --- a/package/yast2-registration.changes +++ b/package/yast2-registration.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 22 12:41:01 UTC 2023 - Stefan Hundhammer + +- Adapted to SCC API change 'base' -> 'isbase' (bsc#1217317): + Cherry-picked igonzalezsosa's commit 431d937b78c209c0d35 +- 4.3.28 + ------------------------------------------------------------------- Wed Aug 2 08:44:51 UTC 2023 - Ladislav Slezák diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec index 356bcc6e..5e2ef167 100644 --- a/package/yast2-registration.spec +++ b/package/yast2-registration.spec @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 4.3.27 +Version: 4.3.28 Release: 0 Summary: YaST2 - Registration Module License: GPL-2.0-only diff --git a/src/lib/registration/ui/migration_repos_workflow.rb b/src/lib/registration/ui/migration_repos_workflow.rb index 271a3ce2..7a521b1d 100644 --- a/src/lib/registration/ui/migration_repos_workflow.rb +++ b/src/lib/registration/ui/migration_repos_workflow.rb @@ -561,7 +561,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}" diff --git a/src/lib/registration/ui/migration_selection_dialog.rb b/src/lib/registration/ui/migration_selection_dialog.rb index a26fcbbc..d5031b18 100644 --- a/src/lib/registration/ui/migration_selection_dialog.rb +++ b/src/lib/registration/ui/migration_selection_dialog.rb @@ -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 diff --git a/test/fixtures/migration_sles15_offline_migrations.yml b/test/fixtures/migration_sles15_offline_migrations.yml index 91b473e2..02802a75 100644 --- a/test/fixtures/migration_sles15_offline_migrations.yml +++ b/test/fixtures/migration_sles15_offline_migrations.yml @@ -7,7 +7,7 @@ :version: '15' :arch: x86_64 :release_type: - :base: true + :isbase: true :product_type: base :free: false :release_stage: beta @@ -19,7 +19,7 @@ :version: '15' :arch: x86_64 :release_type: - :base: false + :isbase: false :product_type: module :free: true :release_stage: released @@ -31,7 +31,7 @@ :version: '15' :arch: x86_64 :release_type: - :base: false + :isbase: false :product_type: module :free: true :release_stage: released @@ -43,7 +43,7 @@ :version: '15' :arch: x86_64 :release_type: - :base: false + :isbase: false :product_type: module :free: true :release_stage: released @@ -55,7 +55,7 @@ :version: '15' :arch: x86_64 :release_type: - :base: false + :isbase: false :product_type: module :free: true :release_stage: released @@ -67,7 +67,7 @@ :version: '15' :arch: x86_64 :release_type: - :base: false + :isbase: false :product_type: module :free: true :release_stage: released @@ -79,7 +79,7 @@ :version: '15' :arch: x86_64 :release_type: - :base: false + :isbase: false :product_type: module :free: true :release_stage: released @@ -91,7 +91,7 @@ :version: '15' :arch: x86_64 :release_type: - :base: false + :isbase: false :product_type: module :free: true :release_stage: released @@ -103,7 +103,7 @@ :version: '15' :arch: x86_64 :release_type: - :base: false + :isbase: false :product_type: module :free: true :release_stage: released @@ -115,7 +115,7 @@ :version: '15' :arch: x86_64 :release_type: - :base: false + :isbase: false :product_type: module :free: true :release_stage: released diff --git a/test/fixtures/migration_to_sles12_sp1.yml b/test/fixtures/migration_to_sles12_sp1.yml index 07001c65..df7d272f 100644 --- a/test/fixtures/migration_to_sles12_sp1.yml +++ b/test/fixtures/migration_to_sles12_sp1.yml @@ -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 diff --git a/test/url_helpers_spec.rb b/test/url_helpers_spec.rb index 96fb1bc4..0302b1a0 100644 --- a/test/url_helpers_spec.rb +++ b/test/url_helpers_spec.rb @@ -152,6 +152,7 @@ context "when the system has been already registered with RMT server" do before do + allow(File).to receive(:exist?).and_call_original allow(File).to receive(:exist?) .with("/mnt/etc/SUSEConnect").and_return(true) end