[yast-commit] [ci_new_pac] JFYI yast2-registration -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-registration -> sle12 ## BNC# 888567 : "list of modules and extensions mixed and in random order" (RESOLVED/FIXED) ## BNC# 894592 : "[s390x][upgrade] failed to register via smt when upgrading from a unregistered sles11sp3" (RESOLVED/FIXED) ## BNC# 895147 : "Build0782 autoyast: SMT registration failed" (RESOLVED/FIXED) ## BNC# 895069 : "Please stop depending on package names for dependencies on rubygems" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-09-04 11:32:19.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-09-05 13:33:01.000000000 +0200 @@ -1,0 +2,16 @@ +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 + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.117 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-registration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old) and /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:43746 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.116.tar.bz2 New: ---- yast2-registration-3.1.118.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.7emC1p/_old 2014-09-05 16:03:38.000000000 +0200 +++ /var/tmp/diff_new_pack.7emC1p/_new 2014-09-05 16:03:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.116 +Version: 3.1.118 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -31,7 +31,7 @@ Requires: yast2-pkg-bindings >= 2.17.20 # N_() method Requires: yast2-ruby-bindings >= 3.1.12 -Requires: rubygem-suse-connect >= 0.2.0 +Requires: rubygem(suse-connect) >= 0.2.0 Requires: yast2-slp >= 3.1.2 Requires: yast2-add-on >= 3.1.8 Requires: yast2-packager >= 3.1.26 @@ -39,9 +39,9 @@ BuildRequires: yast2 >= 3.1.26 BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 3.1.6 -BuildRequires: rubygem-yast-rake >= 0.1.8 -BuildRequires: rubygem-rspec -BuildRequires: rubygem-suse-connect >= 0.2.0 +BuildRequires: rubygem(yast-rake) >= 0.1.8 +BuildRequires: rubygem(rspec) +BuildRequires: rubygem(suse-connect) >= 0.2.0 BuildRequires: yast2-slp >= 3.1.2 BuildRequires: yast2-packager >= 3.1.26 ++++++ yast2-registration-3.1.116.tar.bz2 -> yast2-registration-3.1.118.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/package/yast2-registration.changes new/yast2-registration-3.1.118/package/yast2-registration.changes --- old/yast2-registration-3.1.116/package/yast2-registration.changes 2014-09-04 09:59:34.000000000 +0200 +++ new/yast2-registration-3.1.118/package/yast2-registration.changes 2014-09-05 13:28:19.000000000 +0200 @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +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 + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.117 + +------------------------------------------------------------------- Thu Sep 4 06:58:14 UTC 2014 - jreidinger@suse.com - avoid crash in autoinstallation with method called on nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/package/yast2-registration.spec new/yast2-registration-3.1.118/package/yast2-registration.spec --- old/yast2-registration-3.1.116/package/yast2-registration.spec 2014-09-04 09:59:34.000000000 +0200 +++ new/yast2-registration-3.1.118/package/yast2-registration.spec 2014-09-05 13:28:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.116 +Version: 3.1.118 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -31,7 +31,7 @@ Requires: yast2-pkg-bindings >= 2.17.20 # N_() method Requires: yast2-ruby-bindings >= 3.1.12 -Requires: rubygem-suse-connect >= 0.2.0 +Requires: rubygem(suse-connect) >= 0.2.0 Requires: yast2-slp >= 3.1.2 Requires: yast2-add-on >= 3.1.8 Requires: yast2-packager >= 3.1.26 @@ -39,9 +39,9 @@ BuildRequires: yast2 >= 3.1.26 BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 3.1.6 -BuildRequires: rubygem-yast-rake >= 0.1.8 -BuildRequires: rubygem-rspec -BuildRequires: rubygem-suse-connect >= 0.2.0 +BuildRequires: rubygem(yast-rake) >= 0.1.8 +BuildRequires: rubygem(rspec) +BuildRequires: rubygem(suse-connect) >= 0.2.0 BuildRequires: yast2-slp >= 3.1.2 BuildRequires: yast2-packager >= 3.1.26 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/src/clients/inst_scc.rb new/yast2-registration-3.1.118/src/clients/inst_scc.rb --- old/yast2-registration-3.1.116/src/clients/inst_scc.rb 2014-09-04 09:59:34.000000000 +0200 +++ new/yast2-registration-3.1.118/src/clients/inst_scc.rb 2014-09-05 13:28:19.000000000 +0200 @@ -95,6 +95,8 @@ 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 @@ 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 @@ end def display_registered_dialog + log.info "The system is already registered, displaying registered dialog" + Wizard.SetContents( # dialog title _("Registration"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/src/clients/scc_auto.rb new/yast2-registration-3.1.118/src/clients/scc_auto.rb --- old/yast2-registration-3.1.116/src/clients/scc_auto.rb 2014-09-04 09:59:34.000000000 +0200 +++ new/yast2-registration-3.1.118/src/clients/scc_auto.rb 2014-09-05 13:28:19.000000000 +0200 @@ -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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/src/lib/registration/addon.rb new/yast2-registration-3.1.118/src/lib/registration/addon.rb --- old/yast2-registration-3.1.116/src/lib/registration/addon.rb 2014-09-04 09:59:34.000000000 +0200 +++ new/yast2-registration-3.1.118/src/lib/registration/addon.rb 2014-09-05 13:28:19.000000000 +0200 @@ -77,6 +77,7 @@ :friendly_name, :identifier, :name, + :product_type, :release_type, :version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/src/lib/registration/addon_sorter.rb new/yast2-registration-3.1.118/src/lib/registration/addon_sorter.rb --- old/yast2-registration-3.1.116/src/lib/registration/addon_sorter.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.118/src/lib/registration/addon_sorter.rb 2014-09-05 13:28:19.000000000 +0200 @@ -0,0 +1,30 @@ + +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 + 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 + else + # sort the groups by name + x.name <=> y.name + end + end + +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/src/lib/registration/registration.rb new/yast2-registration-3.1.118/src/lib/registration/registration.rb --- old/yast2-registration-3.1.116/src/lib/registration/registration.rb 2014-09-04 09:59:34.000000000 +0200 +++ new/yast2-registration-3.1.118/src/lib/registration/registration.rb 2014-09-05 13:28:19.000000000 +0200 @@ -104,6 +104,7 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/src/lib/registration/ui/addon_selection_dialog.rb new/yast2-registration-3.1.118/src/lib/registration/ui/addon_selection_dialog.rb --- old/yast2-registration-3.1.116/src/lib/registration/ui/addon_selection_dialog.rb 2014-09-04 09:59:34.000000000 +0200 +++ new/yast2-registration-3.1.118/src/lib/registration/ui/addon_selection_dialog.rb 2014-09-05 13:28:19.000000000 +0200 @@ -1,6 +1,7 @@ require "yast" require "registration/addon" +require "registration/addon_sorter" module Registration module UI @@ -28,6 +29,10 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/src/lib/registration/url_helpers.rb new/yast2-registration-3.1.118/src/lib/registration/url_helpers.rb --- old/yast2-registration-3.1.116/src/lib/registration/url_helpers.rb 2014-09-04 09:59:34.000000000 +0200 +++ new/yast2-registration-3.1.118/src/lib/registration/url_helpers.rb 2014-09-05 13:28:19.000000000 +0200 @@ -125,6 +125,9 @@ # 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 @@ -159,8 +162,10 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/test/addon_sorter_spec.rb new/yast2-registration-3.1.118/test/addon_sorter_spec.rb --- old/yast2-registration-3.1.116/test/addon_sorter_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.118/test/addon_sorter_spec.rb 2014-09-05 13:28:19.000000000 +0200 @@ -0,0 +1,30 @@ +#! /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")) } + let(:unknown_addons) { YAML.load_file(fixtures_file("available_unknown_addons.yml")) } + + it "sorts the addons in display order" do + 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/test/exceptions_spec.rb new/yast2-registration-3.1.118/test/exceptions_spec.rb --- old/yast2-registration-3.1.116/test/exceptions_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.118/test/exceptions_spec.rb 2014-09-05 13:28:19.000000000 +0200 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/test/fixtures/available_addons.yml new/yast2-registration-3.1.118/test/fixtures/available_addons.yml --- old/yast2-registration-3.1.116/test/fixtures/available_addons.yml 2014-09-04 09:59:34.000000000 +0200 +++ new/yast2-registration-3.1.118/test/fixtures/available_addons.yml 2014-09-05 13:28:19.000000000 +0200 @@ -1,134 +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: - :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_... - :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_... - 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: :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: <p> 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. </p> <p> 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. </p> <p> Packages to rebuild SUSE Linux Enterprise Server are not - part of the SUSE Linux Enterprise Software Development Kit. </p> - :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86... - :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_... :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... + 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_... 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: - :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_... - :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: :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-... - :enabled_repositories: - - 1246 - - 1502 - :extensions: [] :repositories: - id: 1502 name: SLE-HA-GEO12-Pool @@ -137,29 +59,16 @@ url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-GEO-POOL-... 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_... - 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 @@ -170,35 +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: :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-legac... - :enabled_repositories: - - 1491 - :extensions: [] + :description: '<p> 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. + </p> <p> 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. </p>' + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-web-s... :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-legac... + 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-s... 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/st... + enabled: true + autorefresh: true + :product_type: module + :extensions: [] modifiable: true children: [] - !ruby/object:Registration::Addon @@ -207,63 +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: :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: <p>This Module contains current versions of the popular configuration + management frameworks Puppet and CFEngine as well as the new systems management + toolbox called machinery.</p> <p>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. </p> :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-s... 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:/... + 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' :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: '<p> 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. + </p> <p> 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-s... - :enabled_repositories: - - 1494 - :extensions: [] + Enterprise Server itself; please check the Release Notes for further details. + </p>' + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legac... :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-s... + description: SLE-Module-Legacy12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legac... 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 @@ -272,31 +209,144 @@ :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 + :description: <p> 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. </p> <p> 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. </p> :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-publi... 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/sta... + 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_... + :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_... + 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_... + 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: <p> 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. </p> <p> 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. </p> <p> Packages to rebuild SUSE Linux Enterprise Server are not + part of the SUSE Linux Enterprise Software Development Kit. </p> + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86... + :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... + 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/test/fixtures/available_unknown_addons.yml new/yast2-registration-3.1.118/test/fixtures/available_unknown_addons.yml --- old/yast2-registration-3.1.116/test/fixtures/available_unknown_addons.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.118/test/fixtures/available_unknown_addons.yml 2014-09-05 13:28:19.000000000 +0200 @@ -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: '<p> 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. + </p> <p> 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. </p>' + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-web-s... + :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-s... + 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/st... + 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: <p>This Module contains current versions of the popular configuration + management frameworks Puppet and CFEngine as well as the new systems management + toolbox called machinery.</p> <p>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. </p> + :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-s... + 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:/... + 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: <p> 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. </p> <p> 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. </p> <p> Packages to rebuild SUSE Linux Enterprise Server are not + part of the SUSE Linux Enterprise Software Development Kit. </p> + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86... + :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... + 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: '<p> 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. + </p> <p> 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. + </p>' + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legac... + :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-legac... + 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: <p> 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. </p> <p> 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. </p> + :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-publi... + 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/sta... + 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_... + :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_... + 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_... + 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: [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.116/test/url_helpers_spec.rb new/yast2-registration-3.1.118/test/url_helpers_spec.rb --- old/yast2-registration-3.1.116/test/url_helpers_spec.rb 2014-09-04 09:59:34.000000000 +0200 +++ new/yast2-registration-3.1.118/test/url_helpers_spec.rb 2014-09-05 13:28:19.000000000 +0200 @@ -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 continue with "q"... Checked in at Fri Sep 5 16:04:01 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro