Attachment #874414 for bug #1223107

View | Details | Raw Unified | Return to bug 1223107
Collapse All | Expand All




                                          .select { |p| p.is_a?(Y2Packager::RepoProductSpec) }
        log.info("Found base products on the offline medium: #{products.pretty_inspect}")

        # in SP6+ always use the new product mapping
        new_migration = true

          version = p.version.split(".")
          major = version[0].to_i
          minor = version[1].to_i

          # SLE15-SP6 or newer
          major > 15 || (major == 15 && minor >= 6)
        end

        log.info "Using SP6+ product upgrade mapping: #{new_migration}"
        Y2Packager::ProductUpgrade.new_renames = new_migration
        Yast::AddOnProduct.new_renames = new_migration





      # helper method to update the product mapping in Y2Packager::ProductUpgrade
      def update_product_mapping
        # in SP6+ always use the new product mapping
        new_migration = true

          version = p.version.split(".")
          major = version[0].to_i
          minor = version[1].to_i

          # SLE15-SP6 or newer
          major > 15 || (major == 15 && minor >= 6)
        end

        log.info "Using SP6+ product upgrade mapping: #{new_migration}"
        Y2Packager::ProductUpgrade.new_renames = new_migration
        Yast::AddOnProduct.new_renames = new_migration

Return to bug 1223107

Lines 689-705 module Registration Link Here

(-)a/src/lib/registration/ui/migration_repos_workflow.rb (-11 / +2 lines)
689	.select { \|p\| p.is_a?(Y2Packager::RepoProductSpec) }	689	.select { \|p\| p.is_a?(Y2Packager::RepoProductSpec) }
690	log.info("Found base products on the offline medium: #{products.pretty_inspect}")	690	log.info("Found base products on the offline medium: #{products.pretty_inspect}")
691		691
692	new_migration = products.any? do \|p\|	692	# in SP6+ always use the new product mapping
693	next false unless p.name == "SLES" \|\| p.name == "SLE_HPC"	693	new_migration = true
694
695	version = p.version.split(".")
696	major = version[0].to_i
697	minor = version[1].to_i
698
699	# SLE15-SP6 or newer
700	major > 15 \|\| (major == 15 && minor >= 6)
701	end
702
703	log.info "Using SP6+ product upgrade mapping: #{new_migration}"	694	log.info "Using SP6+ product upgrade mapping: #{new_migration}"
704	Y2Packager::ProductUpgrade.new_renames = new_migration	695	Y2Packager::ProductUpgrade.new_renames = new_migration
705	Yast::AddOnProduct.new_renames = new_migration	696	Yast::AddOnProduct.new_renames = new_migration

Lines 219-235 module Registration Link Here

(-)a/src/lib/registration/ui/migration_selection_dialog.rb (-11 / +2 lines)
219		219
220	# helper method to update the product mapping in Y2Packager::ProductUpgrade	220	# helper method to update the product mapping in Y2Packager::ProductUpgrade
221	def update_product_mapping	221	def update_product_mapping
222	new_migration = current_migration.any? do \|p\|	222	# in SP6+ always use the new product mapping
223	next false unless p.identifier == "SLES" \|\| p.identifier == "SLE_HPC"	223	new_migration = true
224
225	version = p.version.split(".")
226	major = version[0].to_i
227	minor = version[1].to_i
228
229	# SLE15-SP6 or newer
230	major > 15 \|\| (major == 15 && minor >= 6)
231	end
232
233	log.info "Using SP6+ product upgrade mapping: #{new_migration}"	224	log.info "Using SP6+ product upgrade mapping: #{new_migration}"
234	Y2Packager::ProductUpgrade.new_renames = new_migration	225	Y2Packager::ProductUpgrade.new_renames = new_migration
235	Yast::AddOnProduct.new_renames = new_migration	226	Yast::AddOnProduct.new_renames = new_migration