From eb4bb642ced53194ee54beaae6ec69b3731135cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Mon, 1 Sep 2014 14:42:32 +0200 Subject: [PATCH 1/8] sort displayed addons (bnc#888567) --- src/lib/registration/addon.rb | 1 + src/lib/registration/addon_sorter.rb | 21 +++++++++++++++++++ .../registration/ui/addon_selection_dialog.rb | 5 +++++ test/addon_sorter_spec.rb | 20 ++++++++++++++++++ test/fixtures/available_addons.yml | 8 +++++++ 5 files changed, 55 insertions(+) create mode 100644 src/lib/registration/addon_sorter.rb create mode 100755 test/addon_sorter_spec.rb diff --git a/src/lib/registration/addon.rb b/src/lib/registration/addon.rb index 55c0280dc..6aa5d7b9a 100644 --- a/src/lib/registration/addon.rb +++ b/src/lib/registration/addon.rb @@ -77,6 +77,7 @@ def create_addon_with_deps(root) :friendly_name, :identifier, :name, + :product_type, :release_type, :version diff --git a/src/lib/registration/addon_sorter.rb b/src/lib/registration/addon_sorter.rb new file mode 100644 index 000000000..66171e13a --- /dev/null +++ b/src/lib/registration/addon_sorter.rb @@ -0,0 +1,21 @@ + +module Registration + + # Sorter for sorting Addons in required display order + # (first paid extensions, then free extensions, modules at the end + # see https://bugzilla.novell.com/show_bug.cgi?id=888567#c21) + ADDON_SORTER = Proc.new do |x, y| + if x.product_type != y.product_type + # simplification: "extension" is lexicographically before "module" + # as requested in the display order so take advantage of this... + x.product_type.to_s <=> y.product_type.to_s + elsif x.free != y.free + # paid (non-free) first + x.free ? 1 : -1 + else + # sort the groups by name + x.name <=> y.name + end + end + +end diff --git a/src/lib/registration/ui/addon_selection_dialog.rb b/src/lib/registration/ui/addon_selection_dialog.rb index 4eb49493f..faa918273 100644 --- a/src/lib/registration/ui/addon_selection_dialog.rb +++ b/src/lib/registration/ui/addon_selection_dialog.rb @@ -1,6 +1,7 @@ require "yast" require "registration/addon" +require "registration/addon_sorter" module Registration module UI @@ -28,6 +29,10 @@ def self.run(registration) def initialize(registration) textdomain "registration" @addons = Addon.find_all(registration) + + # sort the addons + @addons.sort!(&::Registration::ADDON_SORTER) + log.info "Available addons: #{@addons}" end diff --git a/test/addon_sorter_spec.rb b/test/addon_sorter_spec.rb new file mode 100755 index 000000000..541a55467 --- /dev/null +++ b/test/addon_sorter_spec.rb @@ -0,0 +1,20 @@ +#! /usr/bin/env rspec + +require_relative "spec_helper" + +require "yaml" +require "registration/addon" +require "registration/addon_sorter" + +describe "Registration::ADDON_SORTER" do + let(:available_addons) { YAML.load_file(fixtures_file("available_addons.yml")) } + + it "sorts the addons in display order" do + expected = ["sle-hae", "sle-ha-geo", "sle-sdk", "sle-we", + "sle-module-adv-systems-management", "sle-module-legacy", + "sle-module-public-cloud", "sle-module-web-scripting"] + + expect(available_addons.sort(&Registration::ADDON_SORTER).map(&:identifier)).to eql(expected) + end + +end diff --git a/test/fixtures/available_addons.yml b/test/fixtures/available_addons.yml index 7f5ee92eb..7dadd783b 100644 --- a/test/fixtures/available_addons.yml +++ b/test/fixtures/available_addons.yml @@ -7,6 +7,7 @@ :identifier: sle-we :version: '12' :release_type: + :product_type: 'extension' :arch: x86_64 :friendly_name: SUSE Linux Enterprise Workstation Extension 12 x86_64 :product_class: @@ -54,6 +55,7 @@ :identifier: sle-sdk :version: '12' :release_type: + :product_type: 'extension' :arch: x86_64 :friendly_name: SUSE Linux Enterprise Software Development Kit 12 x86_64 :product_class: @@ -98,6 +100,7 @@ :identifier: sle-hae :version: '12' :release_type: + :product_type: 'extension' :arch: x86_64 :friendly_name: SUSE Linux Enterprise High Availability Extension 12 x86_64 :product_class: @@ -116,6 +119,7 @@ :identifier: sle-ha-geo :version: '12' :release_type: + :product_type: 'extension' :arch: x86_64 :friendly_name: SUSE Linux Enterprise High Availability GEO Extension 12 x86_64 @@ -175,6 +179,7 @@ :identifier: sle-module-legacy :version: '12' :release_type: + :product_type: 'module' :arch: x86_64 :friendly_name: Legacy Module 12 x86_64 :product_class: @@ -209,6 +214,7 @@ :identifier: sle-module-adv-systems-management :version: '12' :release_type: + :product_type: 'module' :arch: x86_64 :friendly_name: Advanced Systems Management Module 12 x86_64 :product_class: @@ -239,6 +245,7 @@ :name: Web and Scripting Module :identifier: sle-module-web-scripting :version: '12' + :product_type: 'module' :release_type: :arch: x86_64 :friendly_name: Web and Scripting Module 12 x86_64 @@ -274,6 +281,7 @@ :identifier: sle-module-public-cloud :version: '12' :release_type: + :product_type: 'module' :arch: x86_64 :friendly_name: Public Cloud Module 12 x86_64 :product_class: From 6827d6902c916d1322ec68b652c9b8240f1c2dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 3 Sep 2014 16:25:45 +0200 Subject: [PATCH 2/8] use the custom URL also in upgrade (bnc#894592) --- src/lib/registration/url_helpers.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/registration/url_helpers.rb b/src/lib/registration/url_helpers.rb index b99822c97..65dad0779 100644 --- a/src/lib/registration/url_helpers.rb +++ b/src/lib/registration/url_helpers.rb @@ -125,6 +125,9 @@ def self.reg_url_at_installation # get registration URL in upgrade mode def self.reg_url_at_upgrade + custom_url = ::Registration::Storage::InstallationOptions.instance.custom_url + return custom_url if custom_url && !custom_url.empty? + # boot command line if present boot_url = boot_reg_url return boot_url if boot_url From c077badb38088202df22c074eb041da876215c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 3 Sep 2014 18:32:39 +0200 Subject: [PATCH 3/8] added some logging, continue after registring the system --- src/clients/inst_scc.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/clients/inst_scc.rb b/src/clients/inst_scc.rb index d3206576b..0871c877f 100644 --- a/src/clients/inst_scc.rb +++ b/src/clients/inst_scc.rb @@ -95,6 +95,8 @@ def initialize_regcodes end def register_base_system + log.info "The system is not registered, diplaying registration dialog" + show_scc_credentials_dialog ret = nil @@ -141,6 +143,7 @@ def register_base_system register_base_product: !options.base_registered, disable_updates: !install_updates?) if success + ret = :next options.base_registered = true # save the config if running in installed system # (in installation/upgrade it's written in _finish client) @@ -438,6 +441,8 @@ def registered_dialog end def display_registered_dialog + log.info "The system is already registered, displaying registered dialog" + Wizard.SetContents( # dialog title _("Registration"), From d086d3922a1455e77f80f4d30422c3e7fbb1bb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 3 Sep 2014 18:57:55 +0200 Subject: [PATCH 4/8] avoid SLP discovery if the default SCC server was already used for registration --- src/lib/registration/url_helpers.rb | 6 ++++-- test/url_helpers_spec.rb | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/lib/registration/url_helpers.rb b/src/lib/registration/url_helpers.rb index 65dad0779..0f345d30d 100644 --- a/src/lib/registration/url_helpers.rb +++ b/src/lib/registration/url_helpers.rb @@ -162,8 +162,10 @@ def self.reg_url_at_runnig_system return custom_url if custom_url && !custom_url.empty? # check for previously saved config value - config = SUSE::Connect::Config.new - return config.url if config.url + if File.exist?(SUSE::Connect::Config::DEFAULT_CONFIG_FILE) + config = SUSE::Connect::Config.new + return config.url + end # try SLP if not registered yet slp_url = slp_service_url diff --git a/test/url_helpers_spec.rb b/test/url_helpers_spec.rb index 4ab9cf1bb..61c648494 100755 --- a/test/url_helpers_spec.rb +++ b/test/url_helpers_spec.rb @@ -70,14 +70,17 @@ it "return nil (default) if config file is not present" do # stub config file reading - expect_any_instance_of(SUSE::Connect::Config).to receive(:url) + expect(File).to receive(:exist?).with(SUSE::Connect::Config::DEFAULT_CONFIG_FILE). + and_return(false) expect(Registration::UrlHelpers.registration_url).to be_nil end it "reads the URL from config file if present" do # stub config file reading url = "https://example.com" - expect_any_instance_of(SUSE::Connect::Config).to receive(:url).twice.and_return(url) + expect(File).to receive(:exist?).with(SUSE::Connect::Config::DEFAULT_CONFIG_FILE). + and_return(true).twice + expect(YAML).to receive(:load_file).and_return("url" => url, "insecure" => false) expect(Registration::UrlHelpers.registration_url).to eq(url) end end From f788178d04c37369ad3e5b5ad0ad665b481a928d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 4 Sep 2014 16:12:12 +0200 Subject: [PATCH 5/8] added exceptions_spec.rb test --- test/exceptions_spec.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 test/exceptions_spec.rb diff --git a/test/exceptions_spec.rb b/test/exceptions_spec.rb new file mode 100755 index 000000000..443c76afa --- /dev/null +++ b/test/exceptions_spec.rb @@ -0,0 +1,13 @@ +#! /usr/bin/env rspec + +require_relative "spec_helper" + +require "registration/exceptions" + +describe Registration::ServiceError do + + it "is a PkgError exception" do + expect(Registration::ServiceError.new("failed", "ServiceFoo")).to be_a(Registration::PkgError) + end + +end From 2cba15e41bf39053cf1fad3044882c44f409fde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 5 Sep 2014 11:00:22 +0200 Subject: [PATCH 6/8] addon sorter - better handle nil or empty product_type value --- src/lib/registration/addon_sorter.rb | 15 +- src/lib/registration/registration.rb | 1 + test/addon_sorter_spec.rb | 12 +- test/fixtures/available_addons.yml | 410 ++++++++++++--------- test/fixtures/available_unknown_addons.yml | 275 ++++++++++++++ 5 files changed, 525 insertions(+), 188 deletions(-) create mode 100644 test/fixtures/available_unknown_addons.yml diff --git a/src/lib/registration/addon_sorter.rb b/src/lib/registration/addon_sorter.rb index 66171e13a..d00f89291 100644 --- a/src/lib/registration/addon_sorter.rb +++ b/src/lib/registration/addon_sorter.rb @@ -6,9 +6,18 @@ module Registration # see https://bugzilla.novell.com/show_bug.cgi?id=888567#c21) ADDON_SORTER = Proc.new do |x, y| if x.product_type != y.product_type - # simplification: "extension" is lexicographically before "module" - # as requested in the display order so take advantage of this... - x.product_type.to_s <=> y.product_type.to_s + begin + # if empty or nil move at the end + if !x.product_type || x.product_type.empty? + 1 + elsif !y.product_type || y.product_type.empty? + -1 + else + # simplification: "extension" is lexicographically before "module" + # as requested in the display order so take advantage of this... + x.product_type <=> y.product_type + end + end elsif x.free != y.free # paid (non-free) first x.free ? 1 : -1 diff --git a/src/lib/registration/registration.rb b/src/lib/registration/registration.rb index 66570df0a..c1406298f 100644 --- a/src/lib/registration/registration.rb +++ b/src/lib/registration/registration.rb @@ -104,6 +104,7 @@ def get_addon_list end def activated_products + log.info "Reading activated products..." activated = SUSE::Connect::YaST.status(connect_params({})).activated_products || [] log.info "Activated products: #{activated.map(&:id)}" activated diff --git a/test/addon_sorter_spec.rb b/test/addon_sorter_spec.rb index 541a55467..9fbdbabf3 100755 --- a/test/addon_sorter_spec.rb +++ b/test/addon_sorter_spec.rb @@ -8,13 +8,23 @@ describe "Registration::ADDON_SORTER" do let(:available_addons) { YAML.load_file(fixtures_file("available_addons.yml")) } + let(:unknown_addons) { YAML.load_file(fixtures_file("available_unknown_addons.yml")) } it "sorts the addons in display order" do - expected = ["sle-hae", "sle-ha-geo", "sle-sdk", "sle-we", + expected = ["sle-ha", "sle-ha-geo", "sle-sdk", "sle-we", "sle-module-adv-systems-management", "sle-module-legacy", "sle-module-public-cloud", "sle-module-web-scripting"] expect(available_addons.sort(&Registration::ADDON_SORTER).map(&:identifier)).to eql(expected) end + it "moves the unknown product types at the end" do + # AdvMgmt and Legacy have undefined type => at the end + expected = ["sle-sdk", "sle-we", "sle-module-public-cloud", + "sle-module-web-scripting", "sle-module-legacy", + "sle-module-adv-systems-management"] + + expect(unknown_addons.sort(&Registration::ADDON_SORTER).map(&:identifier)).to eql(expected) + end + end diff --git a/test/fixtures/available_addons.yml b/test/fixtures/available_addons.yml index 7dadd783b..24ebf9c59 100644 --- a/test/fixtures/available_addons.yml +++ b/test/fixtures/available_addons.yml @@ -1,138 +1,56 @@ --- -- !ruby/object:Registration::Addon - pure_addon: !ruby/object:SUSE::Connect::Remote::Product - table: - :id: 1222 - :name: SUSE Linux Enterprise Workstation Extension - :identifier: sle-we - :version: '12' - :release_type: - :product_type: 'extension' - :arch: x86_64 - :friendly_name: SUSE Linux Enterprise Workstation Extension 12 x86_64 - :product_class: - :cpe: cpe:/o:suse:sle-we:12.0 - :free: true - :description: SUSE Linux Enterprise Workstation Extension extends the functionality - of SUSE Linux Enterprise Server with packages of SUSE Linux Enterprise Desktop, - like additional desktop applications (office suite, email client, graphical - editor ...) and libraries. It allows to combine both products to create a - full featured Workstation. - :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-WE-POOL-x86_64-Media1.license/ - :enabled_repositories: - - 1468 - - 1485 - :extensions: [] - :repositories: - - id: 1469 - name: SLE-WE12-Debuginfo-Updates - distro_target: sle-12-x86_64 - description: SLE-WE12-Debuginfo-Updates for sle-12-x86_64 - url: https://nu.novell.com/SUSE:/Updates:/SLE-WE:/12:/x86_64/standard_debug - enabled: false - autorefresh: true - - id: 1485 - name: SLE-WE12-Pool - distro_target: sle-12-x86_64 - description: SLE-WE12-Pool for sle-12-x86_64 - url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-WE-POOL-x86_64-Media1 - enabled: true - autorefresh: false - - id: 1468 - name: SLE-WE12-Updates - distro_target: sle-12-x86_64 - description: SLE-WE12-Updates for sle-12-x86_64 - url: https://nu.novell.com/SUSE:/Updates:/SLE-WE:/12:/x86_64/standard - enabled: true - autorefresh: true - modifiable: true - children: [] -- !ruby/object:Registration::Addon +- &2 !ruby/object:Registration::Addon pure_addon: !ruby/object:SUSE::Connect::Remote::Product table: - :id: 1223 - :name: SUSE Linux Enterprise Software Development Kit - :identifier: sle-sdk + :id: 1245 + :name: SUSE Linux Enterprise High Availability Extension + :identifier: sle-ha + :former_identifier: sle-hae :version: '12' :release_type: - :product_type: 'extension' :arch: x86_64 - :friendly_name: SUSE Linux Enterprise Software Development Kit 12 x86_64 + :friendly_name: SUSE Linux Enterprise High Availability Extension 12 x86_64 :product_class: - :cpe: cpe:/o:suse:sle-sdk:12.0 - :free: true - :description:

SUSE Linux Enterprise Software Development Kit 12 is the Software - Development Kit for the family of SUSE Linux Enterprise products. It is a - free of charge extension for partners and customers working with SUSE Linux - Enterprise Server and Desktop and derived products.

Packages on the - SDK are delivered without L3 support; maintenance updates will be done for - critical security and critical non-security issues, and where needed to remain - in sync with packages delivered in the SUSE Linux Enterprise Server and Desktop - products.

Packages to rebuild SUSE Linux Enterprise Server are not - part of the SUSE Linux Enterprise Software Development Kit.

- :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86_64-Media1.license/ - :enabled_repositories: - - 1232 - - 1488 - :extensions: [] + :product_family: sle-ha + :cpe: cpe:/o:suse:sle-ha:12.0 + :free: + :description: SUSE Linux Enterprise High Availability Extension. + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-POOL-x86_64-Media1.license/ :repositories: - - id: 1488 - name: SLE-SDK12-Pool + - id: 1500 + name: SLE-HA12-Pool distro_target: sle-12-x86_64 - description: SLE-SDK12-Pool for sle-12-x86_64 - url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86_64-Media1 + description: SLE-HA12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-POOL-x86_64-Media1 enabled: true autorefresh: false - - id: 1232 - name: SLE-SDK12-Updates + - id: 1539 + name: SLE-HA12-Updates distro_target: sle-12-x86_64 - description: SLE-SDK12-Updates for sle-12-x86_64 - url: https://nu.novell.com/SUSE:/Updates:/SLE-SDK:/12:/x86_64/standard + description: SLE-HA12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-HA:/12:/x86_64/standard enabled: true autorefresh: true - modifiable: true - children: [] -- &2 !ruby/object:Registration::Addon - pure_addon: !ruby/object:SUSE::Connect::Remote::Product - table: - :id: 1155 - :name: SUSE Linux Enterprise High Availability Extension - :identifier: sle-hae - :version: '12' - :release_type: - :product_type: 'extension' - :arch: x86_64 - :friendly_name: SUSE Linux Enterprise High Availability Extension 12 x86_64 - :product_class: - :cpe: cpe:/o:suse:sle-hae:12.0 - :free: false - :description: SUSE Linux Enterprise High Availability Extension. - :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-POOL-x86_64-Media1.license/ - :enabled_repositories: - - 1242 - - 1500 + :product_type: extension :extensions: - &1 !ruby/object:SUSE::Connect::Remote::Product table: :id: 1157 :name: SUSE Linux Enterprise High Availability GEO Extension :identifier: sle-ha-geo + :former_identifier: sle-haegeo :version: '12' :release_type: - :product_type: 'extension' :arch: x86_64 :friendly_name: SUSE Linux Enterprise High Availability GEO Extension 12 x86_64 :product_class: + :product_family: sle-ha :cpe: cpe:/o:suse:sle-ha-geo:12.0 - :free: false + :free: :description: SUSE Linux Enterprise High Availability Geographical Cluster Extension :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-GEO-POOL-s390x-x86_64-Media1.license/ - :enabled_repositories: - - 1246 - - 1502 - :extensions: [] :repositories: - id: 1502 name: SLE-HA-GEO12-Pool @@ -141,29 +59,16 @@ url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-GEO-POOL-s390x-x86_64-Media1 enabled: true autorefresh: false - - id: 1246 + - id: 1545 name: SLE-HA-GEO12-Updates distro_target: sle-12-x86_64 description: SLE-HA-GEO12-Updates for sle-12-x86_64 - url: https://nu.novell.com/SUSE:/Updates:/SLE-HAE-GEO:/12:/x86_64/standard + url: https://nu.novell.com/SUSE:/Updates:/SLE-HA-GEO:/12:/x86_64/standard enabled: true autorefresh: true + :product_type: extension + :extensions: [] modifiable: true - :repositories: - - id: 1500 - name: SLE-HAE12-Pool - distro_target: sle-12-x86_64 - description: SLE-HAE12-Pool for sle-12-x86_64 - url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-POOL-x86_64-Media1 - enabled: true - autorefresh: false - - id: 1242 - name: SLE-HAE12-Updates - distro_target: sle-12-x86_64 - description: SLE-HAE12-Updates for sle-12-x86_64 - url: https://nu.novell.com/SUSE:/Updates:/SLE-HAE:/12:/x86_64/standard - enabled: true - autorefresh: true modifiable: true children: - &3 !ruby/object:Registration::Addon @@ -174,36 +79,44 @@ - !ruby/object:Registration::Addon pure_addon: !ruby/object:SUSE::Connect::Remote::Product table: - :id: 1150 - :name: Legacy Module - :identifier: sle-module-legacy + :id: 1153 + :name: Web and Scripting Module + :identifier: sle-module-web-scripting + :former_identifier: sle-module-web-scripting :version: '12' :release_type: - :product_type: 'module' :arch: x86_64 - :friendly_name: Legacy Module 12 x86_64 + :friendly_name: Web and Scripting Module 12 x86_64 :product_class: - :cpe: cpe:/o:suse:sle-module-legacy:12.0 + :product_family: sles + :cpe: cpe:/o:suse:sle-module-web-scripting:12.0 :free: true - :description: 'The Legacy Module supports your migration from SUSE Linux Enterprise - 10 and 11 and other systems to SUSE Linux Enterprise 12, by providing packages - which are discontinued on SUSE Linux Enterprise Server, but which you may - rely on, such as: CyrusIMAP, BSD like ftp client, sendmail, IBM Java6. Access - to the Legacy Module is included in your SUSE Linux Enterprise Server subscription. - The module has a different lifecycle than SUSE Linux Enterprise Server itself; - please check the Release Notes for further details.' - :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legacy-POOL-x86_64-Media1.license/ - :enabled_repositories: - - 1491 - :extensions: [] + :description: '

The SUSE Linux Enterprise Web and Scripting Module delivers + a comprehensive suite of scripting languages, frameworks, and related tools + helping developers and systems administrators accelerate the creation of stable, + modern web applications, including: PHP, Ruby on Rails, Python version 3. +

Access to the Web and Scripting Module is included in your SUSE Linux + Enterprise Server subscription. The module has a different lifecycle than + SUSE Linux Enterprise Server itself; please check the Release Notes for further + details.

' + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-web-scripting-POOL-x86_64-Media1.license/ :repositories: - - id: 1491 - name: SLE-MODULE-LEGACY12-Pool + - id: 1494 + name: SLE-Module-Web-Scripting12-Pool distro_target: sle-12-x86_64 - description: SLE-MODULE-LEGACY12-Pool for sle-12-x86_64 - url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legacy-POOL-x86_64-Media1 + description: SLE-Module-Web-Scripting12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-web-scripting-POOL-x86_64-Media1 enabled: true autorefresh: false + - id: 1551 + name: SLE-Module-Web-Scripting12-Updates + distro_target: sle-12-x86_64 + description: SLE-Module-Web-Scripting12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-Module-Web-Scripting:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: module + :extensions: [] modifiable: true children: [] - !ruby/object:Registration::Addon @@ -212,65 +125,82 @@ :id: 1212 :name: Advanced Systems Management Module :identifier: sle-module-adv-systems-management + :former_identifier: sle-module-adv-systems-management :version: '12' :release_type: - :product_type: 'module' :arch: x86_64 :friendly_name: Advanced Systems Management Module 12 x86_64 :product_class: + :product_family: sles :cpe: cpe:/o:suse:sle-module-adv-systems-management:12.0 :free: true - :description: This Module gives you a sneak-peak into our upcoming systems management - toolbox which allows you to inspect systems remotely, store their system description - and create new systems to deploy them in datacenters and clouds. The toolbox - is still in active development and will get regular updates. We welcome feedback! + :description:

This Module contains current versions of the popular configuration + management frameworks Puppet and CFEngine as well as the new systems management + toolbox called machinery.

The machinery tool will be frequently updated + and is SUSE's upcoming systems management toolbox for inspecting and validating + systems remotely, storing their system description and creating new systems + to deploy them in datacenters and clouds.

:eula_url: - :enabled_repositories: - - 1498 - :extensions: [] :repositories: - id: 1498 - name: SLE-MODULE-ADV-SYSTEMS-MANAGEMENT12-Pool + name: SLE-Module-Adv-Systems-Management12-Pool distro_target: sle-12-x86_64 - description: SLE-MODULE-ADV-SYSTEMS-MANAGEMENT12-Pool for sle-12-x86_64 + description: SLE-Module-Adv-Systems-Management12-Pool for sle-12-x86_64 url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-adv-systems-management-POOL-x86_64-Media1 enabled: true autorefresh: false + - id: 1555 + name: SLE-Module-Adv-Systems-Management12-Updates + distro_target: sle-12-x86_64 + description: SLE-Module-Adv-Systems-Management12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-Module-Adv-Systems-Management:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: module + :extensions: [] modifiable: true children: [] - !ruby/object:Registration::Addon pure_addon: !ruby/object:SUSE::Connect::Remote::Product table: - :id: 1153 - :name: Web and Scripting Module - :identifier: sle-module-web-scripting + :id: 1150 + :name: Legacy Module + :identifier: sle-module-legacy + :former_identifier: sle-module-legacy :version: '12' - :product_type: 'module' :release_type: :arch: x86_64 - :friendly_name: Web and Scripting Module 12 x86_64 + :friendly_name: Legacy Module 12 x86_64 :product_class: - :cpe: cpe:/o:suse:sle-module-web-scripting:12.0 + :product_family: sles + :cpe: cpe:/o:suse:sle-module-legacy:12.0 :free: true - :description: 'The SUSE Linux Enterprise Web and Scripting Module delivers a - comprehensive suite of scripting languages, frameworks, and related tools - helping developers and systems administrators accelerate the creation of stable, - modern web applications, including: PHP, Ruby on Rails, Python version 3. - Access to the Web and Scripting Module is included in your SUSE Linux Enterprise + :description: '

The Legacy Module supports your migration from SUSE Linux + Enterprise 10 and 11 and other systems to SUSE Linux Enterprise 12, by providing + packages which are discontinued on SUSE Linux Enterprise Server, but which + you may rely on, such as: CyrusIMAP, BSD like ftp client, sendmail, IBM Java6. +

Access to the Legacy Module is included in your SUSE Linux Enterprise Server subscription. The module has a different lifecycle than SUSE Linux - Enterprise Server itself; please check the Release Notes for further details.' - :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-web-scripting-POOL-x86_64-Media1.license/ - :enabled_repositories: - - 1494 - :extensions: [] + Enterprise Server itself; please check the Release Notes for further details. +

' + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legacy-POOL-x86_64-Media1.license/ :repositories: - - id: 1494 - name: SLE-MODULE-WEB-SCRIPTING12-Pool + - id: 1491 + name: SLE-Module-Legacy12-Pool distro_target: sle-12-x86_64 - description: SLE-MODULE-WEB-SCRIPTING12-Pool for sle-12-x86_64 - url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-web-scripting-POOL-x86_64-Media1 + description: SLE-Module-Legacy12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legacy-POOL-x86_64-Media1 enabled: true autorefresh: false + - id: 1548 + name: SLE-Module-Legacy12-Updates + distro_target: sle-12-x86_64 + description: SLE-Module-Legacy12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-Module-Legacy:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: module + :extensions: [] modifiable: true children: [] - !ruby/object:Registration::Addon @@ -279,32 +209,144 @@ :id: 1220 :name: Public Cloud Module :identifier: sle-module-public-cloud + :former_identifier: sle-module-public-cloud :version: '12' :release_type: - :product_type: 'module' :arch: x86_64 :friendly_name: Public Cloud Module 12 x86_64 :product_class: + :product_family: sles :cpe: cpe:/o:suse:sle-module-public-cloud:12.0 :free: true - :description: The Public Cloud Module is a collection of tools that enables + :description:

The Public Cloud Module is a collection of tools that enables you to create and manage cloud images from the commandline on SUSE Linux Enterprise Server. When building your own images with KIWI or SUSE Studio, initialization - code specific to the target cloud is included in that image. Access to the - Public Cloud Module is included in your SUSE Linux Enterprise Server subscription. - The module has a different lifecycle than SUSE Linux Enterprise Server itself; - please check the Release Notes for further details. + code specific to the target cloud is included in that image.

Access + to the Public Cloud Module is included in your SUSE Linux Enterprise Server + subscription. The module has a different lifecycle than SUSE Linux Enterprise + Server itself; please check the Release Notes for further details.

:eula_url: - :enabled_repositories: - - 1497 - :extensions: [] :repositories: - id: 1497 - name: SLE-MODULE-PUBLIC-CLOUD12-Pool + name: SLE-Module-Public-Cloud12-Pool distro_target: sle-12-x86_64 - description: SLE-MODULE-PUBLIC-CLOUD12-Pool for sle-12-x86_64 + description: SLE-Module-Public-Cloud12-Pool for sle-12-x86_64 url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-public-cloud-POOL-x86_64-Media1 enabled: true autorefresh: false + - id: 1554 + name: SLE-Module-Public-Cloud12-Updates + distro_target: sle-12-x86_64 + description: SLE-Module-Public-Cloud12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-Module-Public-Cloud:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: module + :extensions: [] + modifiable: true + children: [] +- !ruby/object:Registration::Addon + pure_addon: !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1222 + :name: SUSE Linux Enterprise Workstation Extension + :identifier: sle-we + :former_identifier: sle-we + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: SUSE Linux Enterprise Workstation Extension 12 x86_64 + :product_class: + :product_family: sled + :cpe: cpe:/o:suse:sle-we:12.0 + :free: true + :description: SUSE Linux Enterprise Workstation Extension extends the functionality + of SUSE Linux Enterprise Server with packages of SUSE Linux Enterprise Desktop, + like additional desktop applications (office suite, email client, graphical + editor ...) and libraries. It allows to combine both products to create a + full featured Workstation. + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-WE-POOL-x86_64-Media1.license/ + :repositories: + - id: 1503 + name: SLE-12-GA-Desktop-nVidia-Driver + distro_target: sle-12-x86_64 + description: SLE-12-GA-Desktop-nVidia-Driver for sle-12-x86_64 + url: http://download.nvidia.com/novell/sle12 + enabled: true + autorefresh: true + - id: 1543 + name: SLE-WE12-Debuginfo-Pool + distro_target: sle-12-x86_64 + description: SLE-WE12-Debuginfo-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-WE-POOL-x86_64-Media3 + enabled: false + autorefresh: false + - id: 1469 + name: SLE-WE12-Debuginfo-Updates + distro_target: sle-12-x86_64 + description: SLE-WE12-Debuginfo-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-WE:/12:/x86_64/standard_debug + enabled: false + autorefresh: true + - id: 1485 + name: SLE-WE12-Pool + distro_target: sle-12-x86_64 + description: SLE-WE12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-WE-POOL-x86_64-Media1 + enabled: true + autorefresh: false + - id: 1468 + name: SLE-WE12-Updates + distro_target: sle-12-x86_64 + description: SLE-WE12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-WE:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: extension + :extensions: [] + modifiable: true + children: [] +- !ruby/object:Registration::Addon + pure_addon: !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1223 + :name: SUSE Linux Enterprise Software Development Kit + :identifier: sle-sdk + :former_identifier: sle-sdk + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: SUSE Linux Enterprise Software Development Kit 12 x86_64 + :product_class: + :product_family: sles + :cpe: cpe:/o:suse:sle-sdk:12.0 + :free: true + :description:

SUSE Linux Enterprise Software Development Kit 12 is the Software + Development Kit for the family of SUSE Linux Enterprise products. It is a + free of charge extension for partners and customers working with SUSE Linux + Enterprise Server and Desktop and derived products.

Packages on the + SDK are delivered without L3 support; maintenance updates will be done for + critical security and critical non-security issues, and where needed to remain + in sync with packages delivered in the SUSE Linux Enterprise Server and Desktop + products.

Packages to rebuild SUSE Linux Enterprise Server are not + part of the SUSE Linux Enterprise Software Development Kit.

+ :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86_64-Media1.license/ + :repositories: + - id: 1488 + name: SLE-SDK12-Pool + distro_target: sle-12-x86_64 + description: SLE-SDK12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86_64-Media1 + enabled: true + autorefresh: false + - id: 1232 + name: SLE-SDK12-Updates + distro_target: sle-12-x86_64 + description: SLE-SDK12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-SDK:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: extension + :extensions: [] modifiable: true children: [] diff --git a/test/fixtures/available_unknown_addons.yml b/test/fixtures/available_unknown_addons.yml new file mode 100644 index 000000000..debaa079b --- /dev/null +++ b/test/fixtures/available_unknown_addons.yml @@ -0,0 +1,275 @@ +--- +- !ruby/object:Registration::Addon + pure_addon: !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1153 + :name: Web and Scripting Module + :identifier: sle-module-web-scripting + :former_identifier: sle-module-web-scripting + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: Web and Scripting Module 12 x86_64 + :product_class: + :product_family: sles + :cpe: cpe:/o:suse:sle-module-web-scripting:12.0 + :free: true + :description: '

The SUSE Linux Enterprise Web and Scripting Module delivers + a comprehensive suite of scripting languages, frameworks, and related tools + helping developers and systems administrators accelerate the creation of stable, + modern web applications, including: PHP, Ruby on Rails, Python version 3. +

Access to the Web and Scripting Module is included in your SUSE Linux + Enterprise Server subscription. The module has a different lifecycle than + SUSE Linux Enterprise Server itself; please check the Release Notes for further + details.

' + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-web-scripting-POOL-x86_64-Media1.license/ + :repositories: + - id: 1494 + name: SLE-Module-Web-Scripting12-Pool + distro_target: sle-12-x86_64 + description: SLE-Module-Web-Scripting12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-web-scripting-POOL-x86_64-Media1 + enabled: true + autorefresh: false + - id: 1551 + name: SLE-Module-Web-Scripting12-Updates + distro_target: sle-12-x86_64 + description: SLE-Module-Web-Scripting12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-Module-Web-Scripting:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: module + :extensions: [] + modifiable: true + children: [] +- !ruby/object:Registration::Addon + pure_addon: !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1212 + :name: Advanced Systems Management Module + :identifier: sle-module-adv-systems-management + :former_identifier: sle-module-adv-systems-management + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: Advanced Systems Management Module 12 x86_64 + :product_class: + :product_family: sles + :cpe: cpe:/o:suse:sle-module-adv-systems-management:12.0 + :free: true + :description:

This Module contains current versions of the popular configuration + management frameworks Puppet and CFEngine as well as the new systems management + toolbox called machinery.

The machinery tool will be frequently updated + and is SUSE's upcoming systems management toolbox for inspecting and validating + systems remotely, storing their system description and creating new systems + to deploy them in datacenters and clouds.

+ :eula_url: + :repositories: + - id: 1498 + name: SLE-Module-Adv-Systems-Management12-Pool + distro_target: sle-12-x86_64 + description: SLE-Module-Adv-Systems-Management12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-adv-systems-management-POOL-x86_64-Media1 + enabled: true + autorefresh: false + - id: 1555 + name: SLE-Module-Adv-Systems-Management12-Updates + distro_target: sle-12-x86_64 + description: SLE-Module-Adv-Systems-Management12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-Module-Adv-Systems-Management:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: '' + :extensions: [] + modifiable: true + children: [] +- !ruby/object:Registration::Addon + pure_addon: !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1223 + :name: SUSE Linux Enterprise Software Development Kit + :identifier: sle-sdk + :former_identifier: sle-sdk + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: SUSE Linux Enterprise Software Development Kit 12 x86_64 + :product_class: + :product_family: sles + :cpe: cpe:/o:suse:sle-sdk:12.0 + :free: true + :description:

SUSE Linux Enterprise Software Development Kit 12 is the Software + Development Kit for the family of SUSE Linux Enterprise products. It is a + free of charge extension for partners and customers working with SUSE Linux + Enterprise Server and Desktop and derived products.

Packages on the + SDK are delivered without L3 support; maintenance updates will be done for + critical security and critical non-security issues, and where needed to remain + in sync with packages delivered in the SUSE Linux Enterprise Server and Desktop + products.

Packages to rebuild SUSE Linux Enterprise Server are not + part of the SUSE Linux Enterprise Software Development Kit.

+ :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86_64-Media1.license/ + :repositories: + - id: 1488 + name: SLE-SDK12-Pool + distro_target: sle-12-x86_64 + description: SLE-SDK12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86_64-Media1 + enabled: true + autorefresh: false + - id: 1232 + name: SLE-SDK12-Updates + distro_target: sle-12-x86_64 + description: SLE-SDK12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-SDK:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: extension + :extensions: [] + modifiable: true + children: [] +- !ruby/object:Registration::Addon + pure_addon: !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1150 + :name: Legacy Module + :identifier: sle-module-legacy + :former_identifier: sle-module-legacy + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: Legacy Module 12 x86_64 + :product_class: + :product_family: sles + :cpe: cpe:/o:suse:sle-module-legacy:12.0 + :free: true + :description: '

The Legacy Module supports your migration from SUSE Linux + Enterprise 10 and 11 and other systems to SUSE Linux Enterprise 12, by providing + packages which are discontinued on SUSE Linux Enterprise Server, but which + you may rely on, such as: CyrusIMAP, BSD like ftp client, sendmail, IBM Java6. +

Access to the Legacy Module is included in your SUSE Linux Enterprise + Server subscription. The module has a different lifecycle than SUSE Linux + Enterprise Server itself; please check the Release Notes for further details. +

' + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legacy-POOL-x86_64-Media1.license/ + :repositories: + - id: 1491 + name: SLE-Module-Legacy12-Pool + distro_target: sle-12-x86_64 + description: SLE-Module-Legacy12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legacy-POOL-x86_64-Media1 + enabled: true + autorefresh: false + - id: 1548 + name: SLE-Module-Legacy12-Updates + distro_target: sle-12-x86_64 + description: SLE-Module-Legacy12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-Module-Legacy:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: + :extensions: [] + modifiable: true + children: [] +- !ruby/object:Registration::Addon + pure_addon: !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1220 + :name: Public Cloud Module + :identifier: sle-module-public-cloud + :former_identifier: sle-module-public-cloud + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: Public Cloud Module 12 x86_64 + :product_class: + :product_family: sles + :cpe: cpe:/o:suse:sle-module-public-cloud:12.0 + :free: true + :description:

The Public Cloud Module is a collection of tools that enables + you to create and manage cloud images from the commandline on SUSE Linux Enterprise + Server. When building your own images with KIWI or SUSE Studio, initialization + code specific to the target cloud is included in that image.

Access + to the Public Cloud Module is included in your SUSE Linux Enterprise Server + subscription. The module has a different lifecycle than SUSE Linux Enterprise + Server itself; please check the Release Notes for further details.

+ :eula_url: + :repositories: + - id: 1497 + name: SLE-Module-Public-Cloud12-Pool + distro_target: sle-12-x86_64 + description: SLE-Module-Public-Cloud12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-public-cloud-POOL-x86_64-Media1 + enabled: true + autorefresh: false + - id: 1554 + name: SLE-Module-Public-Cloud12-Updates + distro_target: sle-12-x86_64 + description: SLE-Module-Public-Cloud12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-Module-Public-Cloud:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: module + :extensions: [] + modifiable: true + children: [] +- !ruby/object:Registration::Addon + pure_addon: !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1222 + :name: SUSE Linux Enterprise Workstation Extension + :identifier: sle-we + :former_identifier: sle-we + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: SUSE Linux Enterprise Workstation Extension 12 x86_64 + :product_class: + :product_family: sled + :cpe: cpe:/o:suse:sle-we:12.0 + :free: true + :description: SUSE Linux Enterprise Workstation Extension extends the functionality + of SUSE Linux Enterprise Server with packages of SUSE Linux Enterprise Desktop, + like additional desktop applications (office suite, email client, graphical + editor ...) and libraries. It allows to combine both products to create a + full featured Workstation. + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-WE-POOL-x86_64-Media1.license/ + :repositories: + - id: 1503 + name: SLE-12-GA-Desktop-nVidia-Driver + distro_target: sle-12-x86_64 + description: SLE-12-GA-Desktop-nVidia-Driver for sle-12-x86_64 + url: http://download.nvidia.com/novell/sle12 + enabled: true + autorefresh: true + - id: 1543 + name: SLE-WE12-Debuginfo-Pool + distro_target: sle-12-x86_64 + description: SLE-WE12-Debuginfo-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-WE-POOL-x86_64-Media3 + enabled: false + autorefresh: false + - id: 1469 + name: SLE-WE12-Debuginfo-Updates + distro_target: sle-12-x86_64 + description: SLE-WE12-Debuginfo-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-WE:/12:/x86_64/standard_debug + enabled: false + autorefresh: true + - id: 1485 + name: SLE-WE12-Pool + distro_target: sle-12-x86_64 + description: SLE-WE12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-WE-POOL-x86_64-Media1 + enabled: true + autorefresh: false + - id: 1468 + name: SLE-WE12-Updates + distro_target: sle-12-x86_64 + description: SLE-WE12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-WE:/12:/x86_64/standard + enabled: true + autorefresh: true + :product_type: extension + :extensions: [] + modifiable: true + children: [] From 1b697474ad258118663a101aad9c6e0f7c959bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 5 Sep 2014 11:17:01 +0200 Subject: [PATCH 7/8] added missing require in Autoyast client (bnc#895147) --- src/clients/scc_auto.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/clients/scc_auto.rb b/src/clients/scc_auto.rb index 6e8191804..4e1dfaeb2 100644 --- a/src/clients/scc_auto.rb +++ b/src/clients/scc_auto.rb @@ -32,6 +32,7 @@ require "registration/storage" require "registration/sw_mgmt" require "registration/registration" +require "registration/registration_ui" require "registration/helpers" require "registration/connect_helpers" require "registration/ssl_certificate" From 50cdbed1224e084fb54fa0d3e00f6bbd9975177e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 4 Sep 2014 16:20:24 +0200 Subject: [PATCH 8/8] changes --- package/yast2-registration.changes | 10 ++++++++++ package/yast2-registration.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes index 84178ec0d..c12389728 100644 --- a/package/yast2-registration.changes +++ b/package/yast2-registration.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 4 14:13:20 UTC 2014 - lslezak@suse.cz + +- sort displayed addons to have requested order (bnc#888567) +- use the custom URL also in upgrade (bnc#894592) +- don't run SLP discovery if the system has been registered + using the public SCC server +- added missing "require" in Autoyast client (bnc#895147) +- 3.1.118 + ------------------------------------------------------------------- Thu Sep 4 12:24:30 UTC 2014 - mvidner@suse.com diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec index 1d7adec04..e31a024b4 100644 --- a/package/yast2-registration.spec +++ b/package/yast2-registration.spec @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.117 +Version: 3.1.118 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build