April 2018 - openSUSE Commits - openSUSE Mailing Lists

commit rubygem-cfa for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '18

26 Apr '18

Hello community, here is the log from the commit of package rubygem-cfa for openSUSE:Factory checked in at 2018-04-26 13:31:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-cfa (Old) and /work/SRC/openSUSE:Factory/.rubygem-cfa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-cfa" Thu Apr 26 13:31:36 2018 rev:9 rq:600973 version:0.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-cfa/rubygem-cfa.changes 2018-03-11 18:02:47.644248318 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-cfa.new/rubygem-cfa.changes 2018-04-26 13:31:38.174140329 +0200 @@ -1,0 +2,8 @@ +Thu Mar 15 12:56:30 UTC 2018 - mvidner(a)suse.com + +- Distinguish between parsing and serializing in error reports. +- Mention the file being parsed, and the position inside, in error + reports (bsc#1077435) +- 0.6.4 + +------------------------------------------------------------------- Old: ---- cfa-0.6.3.gem New: ---- cfa-0.6.4.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-cfa.spec ++++++ --- /var/tmp/diff_new_pack.RLE862/_old 2018-04-26 13:31:38.682121720 +0200 +++ /var/tmp/diff_new_pack.RLE862/_new 2018-04-26 13:31:38.682121720 +0200 @@ -17,7 +17,7 @@ Name: rubygem-cfa -Version: 0.6.3 +Version: 0.6.4 Release: 0 %define mod_name cfa %define mod_full_name %{mod_name}-%{version} ++++++ cfa-0.6.3.gem -> cfa-0.6.4.gem ++++++ Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/cfa/augeas_parser.rb new/lib/cfa/augeas_parser.rb --- old/lib/cfa/augeas_parser.rb 2018-03-09 14:50:46.000000000 +0100 +++ new/lib/cfa/augeas_parser.rb 2018-04-25 09:53:05.000000000 +0200 @@ -298,15 +298,20 @@ # require "cfa/augeas_parser" # # parser = CFA::AugeasParser.new("Sysconfig.lns") + # parser.file_name = "/etc/default/grub" # for error reporting # data = parser.parse(File.read("/etc/default/grub")) # # puts data["GRUB_DISABLE_OS_PROBER"] # data["GRUB_DISABLE_OS_PROBER"] = "true" # puts parser.serialize(data) class AugeasParser + # @return [String] optional, used for error reporting + attr_accessor :file_name + # @param lens [String] a lens name, like "Sysconfig.lns" def initialize(lens) @lens = lens + @file_name = nil end # @param raw_string [String] a string to be parsed @@ -324,7 +329,8 @@ root = load_path = nil Augeas.open(root, load_path, Augeas::NO_MODL_AUTOLOAD) do |aug| aug.set("/input", raw_string) - report_error(aug) unless aug.text_store(@lens, "/input", "/store") + report_error(aug, "parsing", file_name) \ + unless aug.text_store(@lens, "/input", "/store") return AugeasReader.read(aug, "/store") end @@ -343,7 +349,7 @@ AugeasWriter.new(aug).write("/store", data) res = aug.text_retrieve(@lens, "/input", "/store", "/output") - report_error(aug) unless res + report_error(aug, "serializing", file_name) unless res return aug.get("/output") end @@ -358,16 +364,30 @@ private # @param aug [::Augeas] - def report_error(aug) + # @param activity ["parsing", "serializing"] for better error messages + # @param file_name [String,nil] a file name + def report_error(aug, activity, file_name) error = aug.error # zero is no error, so problem in lense - if aug.error[:code].nonzero? - raise "Augeas error #{error[:message]}. Details: #{error[:details]}." + if error[:code].nonzero? + raise "Augeas error: #{error[:message]}. Details: #{error[:details]}." end - msg = aug.get("/augeas/text/store/error/message") - location = aug.get("/augeas/text/store/error/lens") - raise "Augeas parsing/serializing error: #{msg} at #{location}" + file_name ||= "(unknown file)" + raise format("Augeas #{activity} error: %<message>s" \ + " at #{file_name}:%<line>s:%<char>s, lens %<lens>s", + aug_get_error(aug)) + end + + def aug_get_error(aug) + { + message: aug.get("/augeas/text/store/error/message"), + line: aug.get("/augeas/text/store/error/line"), + char: aug.get("/augeas/text/store/error/char"), # column + # file, line+column range, like + # "/usr/share/augeas/lenses/dist/hosts.aug:23.12-.42:" + lens: aug.get("/augeas/text/store/error/lens") + } end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/cfa/base_model.rb new/lib/cfa/base_model.rb --- old/lib/cfa/base_model.rb 2018-03-09 14:50:46.000000000 +0100 +++ new/lib/cfa/base_model.rb 2018-04-25 09:53:05.000000000 +0200 @@ -39,6 +39,7 @@ # insertion of such values in the first place. def save(changes_only: false) merge_changes if changes_only + @parser.file_name = @file_path if @parser.respond_to?(:file_name=) @file_handler.write(@file_path, @parser.serialize(data)) end @@ -51,6 +52,7 @@ # @raise a *parser* specific error. If the parsed String is malformed, then # depending on the used parser it may raise an error. def load + @parser.file_name = @file_path if @parser.respond_to?(:file_name=) self.data = @parser.parse(@file_handler.read(@file_path)) @loaded = true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2018-03-09 14:52:12.000000000 +0100 +++ new/metadata 2018-04-25 09:54:45.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: cfa version: !ruby/object:Gem::Version - version: 0.6.3 + version: 0.6.4 platform: ruby authors: - Josef Reidinger autorequire: bindir: bin cert_chain: [] -date: 2018-03-09 00:00:00.000000000 Z +date: 2018-04-25 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: ruby-augeas

1 0

commit libstorage-ng for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '18

26 Apr '18

Hello community, here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2018-04-26 13:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage-ng" Thu Apr 26 13:31:27 2018 rev:18 rq:600804 version:3.3.253 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2018-04-07 20:52:04.617205528 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new/libstorage-ng.changes 2018-04-26 13:31:29.506457858 +0200 @@ -1,0 +2,319 @@ +Wed Apr 25 05:57:55 UTC 2018 - aschnell(a)suse.de + +- merge gh#openSUSE/libstorage-ng#521 +- added stand-alone functions to read fstab and crypttab +- added integration tests +- removed unneeded include +- 3.3.253 + +-------------------------------------------------------------------- +Tue Apr 24 13:24:27 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Portuguese (Brazil)) +- 3.3.252 + +-------------------------------------------------------------------- +Tue Apr 24 11:13:10 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Swedish) +- 3.3.251 + +-------------------------------------------------------------------- +Mon Apr 23 22:14:24 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Swedish) +- 3.3.250 + +-------------------------------------------------------------------- +Mon Apr 23 13:14:03 UTC 2018 - aschnell(a)suse.de + +- merge gh#openSUSE/libstorage-ng#520 +- fixed probing of active flag (bsc#1090520) +- improved error handling +- 3.3.249 + +-------------------------------------------------------------------- +Mon Apr 23 11:09:41 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Polish) +- 3.3.248 + +-------------------------------------------------------------------- +Mon Apr 23 11:09:40 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Russian) +- 3.3.247 + +-------------------------------------------------------------------- +Mon Apr 23 08:14:35 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (German) +- 3.3.246 + +-------------------------------------------------------------------- +Mon Apr 23 07:45:32 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (French) +- 3.3.245 + +-------------------------------------------------------------------- +Mon Apr 23 07:43:14 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (French) +- 3.3.244 + +-------------------------------------------------------------------- +Mon Apr 23 04:00:07 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Chinese (Taiwan)) + +-------------------------------------------------------------------- +Mon Apr 23 04:00:06 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Chinese (China)) + +-------------------------------------------------------------------- +Sun Apr 22 23:25:34 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Russian) +- 3.3.243 + +-------------------------------------------------------------------- +Sat Apr 21 13:03:21 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (German) +- 3.3.242 + +-------------------------------------------------------------------- +Sat Apr 21 12:55:04 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (German) +- 3.3.241 + +-------------------------------------------------------------------- +Fri Apr 20 20:17:19 UTC 2018 - antoine.belvire(a)opensuse.org + +- Translated using Weblate (French) +- 3.3.240 + +-------------------------------------------------------------------- +Fri Apr 20 15:17:59 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (French) +- 3.3.239 + +-------------------------------------------------------------------- +Fri Apr 20 13:07:30 UTC 2018 - aschnell(a)suse.de + +- merge gh#openSUSE/libstorage-ng#518 +- added function to query allowed MD parities (see bsc#1090182) +- 3.3.238 + +-------------------------------------------------------------------- +Fri Apr 20 12:26:33 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (French) + +-------------------------------------------------------------------- +Fri Apr 20 12:05:17 UTC 2018 - weblate-noreply(a)opensuse.org + +- 3.3.237 + +-------------------------------------------------------------------- +Fri Apr 20 12:05:08 UTC 2018 - wfeldt(a)opensuse.org + +- merge gh#openSUSE/libstorage-ng#519 +- update git2log script to avoid identical timestamps in changelog +- 3.3.236 + +-------------------------------------------------------------------- +Fri Apr 20 09:56:57 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Chinese (China)) + +-------------------------------------------------------------------- +Fri Apr 20 09:56:56 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Chinese (Taiwan)) +- 3.3.235 + +-------------------------------------------------------------------- +Fri Apr 20 04:31:08 UTC 2018 - freek(a)opensuse.org + +- Translated using Weblate (Dutch) +- 3.3.234 + +-------------------------------------------------------------------- +Fri Apr 20 04:31:07 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Korean) +- 3.3.233 + +-------------------------------------------------------------------- +Thu Apr 19 14:20:53 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (German) +- 3.3.232 + +-------------------------------------------------------------------- +Thu Apr 19 10:12:40 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Swedish) +- 3.3.231 + +-------------------------------------------------------------------- +Thu Apr 19 07:58:05 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Czech) +- 3.3.230 + +-------------------------------------------------------------------- +Wed Apr 18 23:15:46 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Hungarian) +- 3.3.229 + +-------------------------------------------------------------------- +Wed Apr 18 23:15:45 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Japanese) +- 3.3.228 + +-------------------------------------------------------------------- +Wed Apr 18 21:07:31 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Hungarian) +- 3.3.227 + +-------------------------------------------------------------------- +Wed Apr 18 21:06:50 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (Italian) + +-------------------------------------------------------------------- +Wed Apr 18 17:41:05 UTC 2018 - opensuse-packaging(a)opensuse.org + +- Translated using Weblate (German) +- 3.3.226 ++++ 122 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes ++++ and /work/SRC/openSUSE:Factory/.libstorage-ng.new/libstorage-ng.changes Old: ---- libstorage-ng-3.3.207.tar.xz New: ---- libstorage-ng-3.3.253.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.MjXHEy/_old 2018-04-26 13:31:30.002439688 +0200 +++ /var/tmp/diff_new_pack.MjXHEy/_new 2018-04-26 13:31:30.006439542 +0200 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 3.3.207 +Version: 3.3.253 Release: 0 Summary: Library for storage management License: GPL-2.0 ++++++ libstorage-ng-3.3.207.tar.xz -> libstorage-ng-3.3.253.tar.xz ++++++ ++++ 151952 lines of diff (skipped)

1 0

commit SUSEConnect for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '18

26 Apr '18

Hello community, here is the log from the commit of package SUSEConnect for openSUSE:Factory checked in at 2018-04-26 13:31:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SUSEConnect (Old) and /work/SRC/openSUSE:Factory/.SUSEConnect.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "SUSEConnect" Thu Apr 26 13:31:18 2018 rev:10 rq:600683 version:0.3.10 Changes: -------- --- /work/SRC/openSUSE:Factory/SUSEConnect/SUSEConnect.changes 2018-03-16 10:35:01.590453555 +0100 +++ /work/SRC/openSUSE:Factory/.SUSEConnect.new/SUSEConnect.changes 2018-04-26 13:31:19.674818022 +0200 @@ -1,0 +2,15 @@ +Thu Apr 19 14:30:00 UTC 2018 - fschnizlein(a)suse.com + +- Update to 0.3.10 + - Fix rollback mechanism on SLE15 systems (bsc#1089320) + + +------------------------------------------------------------------- +Thu Apr 5 13:25:00 UTC 2018 - wstephenson(a)suse.com + +- Update to 0.3.9 + - Enable access to package search via gem + - Don't try to delete directory of nonexistent service files + (bsc#1086420) + +------------------------------------------------------------------- Old: ---- suse-connect-0.3.8.gem New: ---- suse-connect-0.3.10.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SUSEConnect.spec ++++++ --- /var/tmp/diff_new_pack.LsMtoz/_old 2018-04-26 13:31:20.218798094 +0200 +++ /var/tmp/diff_new_pack.LsMtoz/_new 2018-04-26 13:31:20.222797948 +0200 @@ -16,11 +16,14 @@ # Name: SUSEConnect -Version: 0.3.8 +Version: 0.3.10 Release: 0 %define mod_name suse-connect %define mod_full_name %{mod_name}-%{version} +# Does not build for i586 and s390 and is not supported on those architectures +ExcludeArch: %ix86 s390 + Requires: coreutils, util-linux, net-tools, hwinfo, zypper, ca-certificates-mozilla Requires: zypper(auto-agree-with-product-licenses) %ifarch x86_64 aarch64 ++++++ SUSEConnect.5 ++++++ --- /var/tmp/diff_new_pack.LsMtoz/_old 2018-04-26 13:31:20.246797068 +0200 +++ /var/tmp/diff_new_pack.LsMtoz/_new 2018-04-26 13:31:20.250796922 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "SUSECONNECT" "5" "March 2017" "" "SUSEConnect" +.TH "SUSECONNECT" "5" "April 2017" "" "SUSEConnect" . .SH "NAME" \fBSUSEConnect\fR \- SUSE Customer Center registration tool config file ++++++ SUSEConnect.8 ++++++ --- /var/tmp/diff_new_pack.LsMtoz/_old 2018-04-26 13:31:20.270796190 +0200 +++ /var/tmp/diff_new_pack.LsMtoz/_new 2018-04-26 13:31:20.270796190 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "SUSECONNECT" "8" "May 2017" "" "SUSEConnect" +.TH "SUSECONNECT" "8" "June 2017" "" "SUSEConnect" . .SH "NAME" \fBSUSEConnect\fR \- SUSE Customer Center registration tool ++++++ suse-connect-0.3.8.gem -> suse-connect-0.3.10.gem ++++++ Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/api.rb new/lib/suse/connect/api.rb --- old/lib/suse/connect/api.rb 2018-03-14 15:36:57.000000000 +0100 +++ new/lib/suse/connect/api.rb 2018-04-24 12:40:15.000000000 +0200 @@ -1,4 +1,5 @@ require 'optparse' +require 'cgi' module SUSE module Connect @@ -14,16 +15,16 @@ # Returns a new instance of SUSE::Connect::Api # - # @param client [SUSE::Connect::Client] client instance + # @param config [SUSE::Connect::Config] config instance # @return [SUSE::Connect::Api] api object to call SCC API - def initialize(client) - @client = client + def initialize(config) + @config = config @connection = Connection.new( - client.config.url, - language: client.config.language, - insecure: client.config.insecure, - verify_callback: client.config.verify_callback, - debug: client.config.debug + config.url, + language: config.language, + insecure: config.insecure, + verify_callback: config.verify_callback, + debug: config.debug ) end @@ -98,7 +99,7 @@ version: product.version, arch: product.arch, release_type: product.release_type, - token: @client.config.token, + token: @config.token, email: email } @connection.post('/connect/systems/products', auth: auth, params: payload) @@ -230,6 +231,20 @@ def list_installer_updates(product) @connection.get('/connect/repositories/installer', params: product.to_params) end + + # Search packages which are available in the product of the base product + # + # @param product [SUSE::Connect::Zypper::Product] the product for in which product tree should be searched + # @param query [String] The package query to search + # + # @return [Array< <Hash>>] of all matched packages available + def package_search(product, query) + api = '/api/package_search/packages' + triplet = CGI.escape(product.to_triplet) + query = CGI.escape(query) + + @connection.get(api + "?product_id=#{triplet}&query=#{query}") + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/cli.rb new/lib/suse/connect/cli.rb --- old/lib/suse/connect/cli.rb 2018-03-14 15:36:57.000000000 +0100 +++ new/lib/suse/connect/cli.rb 2018-04-24 12:40:15.000000000 +0200 @@ -16,7 +16,7 @@ @config = Config.new.merge!(@options) end - def execute! # rubocop:disable MethodLength, CyclomaticComplexity + def execute! # rubocop:disable MethodLength, CyclomaticComplexity, PerceivedComplexity, AbcSize # check for parameter dependencies if @config.status status.print_product_statuses(:json) @@ -26,6 +26,8 @@ Client.new((a)config).deregister! elsif @config.cleanup System.cleanup! + elsif @config.rollback + Migration.rollback elsif @config.list_extensions if status.activated_base_product? status.print_extensions_list @@ -187,9 +189,7 @@ @opts.on('--rollback', 'Revert the registration state in case of a failed', 'migration.') do |_opt| - log.info('> Beginning registration rollback. This can take some time...') - SUSE::Connect::Migration.rollback - exit 0 + @options[:rollback] = true end @opts.separator '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/client.rb new/lib/suse/connect/client.rb --- old/lib/suse/connect/client.rb 2018-03-14 15:36:57.000000000 +0100 +++ new/lib/suse/connect/client.rb 2018-04-24 12:40:15.000000000 +0200 @@ -17,7 +17,7 @@ # @return [Client] def initialize(config) @config = config - @api = Api.new(self) + @api = Api.new(@config) log.debug "Merged options: #{@config}" end @@ -46,11 +46,8 @@ service = activate_product(product, @config.email) System.add_service(service) + Zypper.install_release_package(product.identifier) if install_release_package - if install_release_package - Zypper.refresh_services - Zypper.install_release_package(product.identifier) - end print_success_message(product) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/migration.rb new/lib/suse/connect/migration.rb --- old/lib/suse/connect/migration.rb 2018-03-14 15:36:57.000000000 +0100 +++ new/lib/suse/connect/migration.rb 2018-04-24 12:40:15.000000000 +0200 @@ -18,27 +18,35 @@ # Restores a state of the system before migration def rollback(client_params = {}) + log.info('Starting to sync system product activations to the server. This can take some time...') config = SUSE::Connect::Config.new.merge!(client_params) client = Client.new(config) status = Status.new(config) + base_product = Zypper.base_product - # FIXME: Sort products and ensure the base product is the first one in the list - status.installed_products.sort_by { |p| p.isbase ? 0 : 1 }.each do |product| - service = client.downgrade_product(product) - # INFO: Remove old and new service because this could be called after filesystem rollback or - # from inside a failed migration - remove_service service.name - remove_service service.obsoleted_service_name - - # INFO: Add new service for the same product but with new/valid service url - add_service service.url, service.name + # First rollback the base_product + service = client.downgrade_product(base_product) + refresh_service service + + # Fetch the product tree an get all installed products in right order + installed = Hash[status.installed_products.collect { |p| [p.identifier, p] }] + tree = client.show_product(base_product) + + extensions = client.flatten_tree(tree).select do |extension| + installed.include? extension.identifier + end.map(&:identifier) + + # Rollback all extensions + extensions.each do |extension| + service = client.downgrade_product(installed[extension]) + refresh_service service end # Synchronize installed products with SCC activations (removes obsolete activations) client.synchronize(status.installed_products) # Set releasever to the new baseproduct version - target_version = status.installed_products.find(&:isbase).version + target_version = base_product.version.to_s SUSE::Connect::Zypper.set_release_version(target_version) end @@ -89,6 +97,18 @@ def install_release_package(identifier) SUSE::Connect::Zypper.install_release_package(identifier) end + + # Removes service an readds service with current url and name + # @param Service service which should be refreshed + def refresh_service(service) + # INFO: Remove old and new service because this could be called after filesystem rollback or + # from inside a failed migration + remove_service service.name + remove_service service.obsoleted_service_name + + # INFO: Add new service for the same product but with new/valid service url + add_service service.url, service.name + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/package_search.rb new/lib/suse/connect/package_search.rb --- old/lib/suse/connect/package_search.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/lib/suse/connect/package_search.rb 2018-04-24 12:40:15.000000000 +0200 @@ -0,0 +1,24 @@ +module SUSE + module Connect + # Enable connect and zypper extensions/scripts to search packages for a + # certain product + class PackageSearch + class << self + # Search packages depending on the product and its extension/module + # tree. + # + # @param query [String] package to search + # @param product [SUSE::Connect::Zypper::Product] product to base search on + # @param config_params [<Hash>] overwrites from the config file + # + # @return [Array< <Hash>>] Returns all matched packages or an empty array if no matches where found + def search(query, product: Zypper.base_product, config_params: {}) + config = SUSE::Connect::Config.new.merge!(config_params) + api = SUSE::Connect::Api.new(config) + + api.package_search(product, query).body['data'] + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/remote/product.rb new/lib/suse/connect/remote/product.rb --- old/lib/suse/connect/remote/product.rb 2018-03-14 15:36:57.000000000 +0100 +++ new/lib/suse/connect/remote/product.rb 2018-04-24 12:40:15.000000000 +0200 @@ -24,6 +24,10 @@ } end + def to_triplet + "#{identifier}/#{version}/#{arch}" + end + # This method is needed to compute the distro_target when /etc/products.d/baseproduct # does not exist. This happens e.g. when creating a rootfs from scratch. def distro_target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/version.rb new/lib/suse/connect/version.rb --- old/lib/suse/connect/version.rb 2018-03-14 15:36:57.000000000 +0100 +++ new/lib/suse/connect/version.rb 2018-04-24 12:40:15.000000000 +0200 @@ -1,6 +1,6 @@ module SUSE # Provides access to version number of a gem module Connect - VERSION = '0.3.8' + VERSION = '0.3.10' end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/zypper/product.rb new/lib/suse/connect/zypper/product.rb --- old/lib/suse/connect/zypper/product.rb 2018-03-14 15:36:57.000000000 +0100 +++ new/lib/suse/connect/zypper/product.rb 2018-04-24 12:40:15.000000000 +0200 @@ -22,6 +22,10 @@ } end + def to_triplet + "#{identifier}/#{version}/#{arch}" + end + private def determine_release_type(product_hash) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/zypper.rb new/lib/suse/connect/zypper.rb --- old/lib/suse/connect/zypper.rb 2018-03-14 15:36:57.000000000 +0100 +++ new/lib/suse/connect/zypper.rb 2018-04-24 12:40:15.000000000 +0200 @@ -176,7 +176,7 @@ def remove_service_credentials(service_name) service_credentials_file = File.join(SUSE::Connect::Credentials::DEFAULT_CREDENTIALS_DIR, service_name) - if File.exist?(service_credentials_file) + if File.file?(service_credentials_file) File.delete service_credentials_file end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect.rb new/lib/suse/connect.rb --- old/lib/suse/connect.rb 2018-03-14 15:36:57.000000000 +0100 +++ new/lib/suse/connect.rb 2018-04-24 12:40:15.000000000 +0200 @@ -17,6 +17,7 @@ require 'suse/connect/hwinfo/base' require 'suse/connect/product' require 'suse/connect/migration' + require 'suse/connect/package_search' require 'suse/connect/yast' # Holding all the object classes received from registration server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2018-03-14 15:36:57.000000000 +0100 +++ new/metadata 2018-04-24 12:40:15.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: suse-connect version: !ruby/object:Gem::Version - version: 0.3.8 + version: 0.3.10 platform: ruby authors: - SUSE Customer Center Team autorequire: bindir: bin cert_chain: [] -date: 2018-03-14 00:00:00.000000000 Z +date: 2018-04-24 00:00:00.000000000 Z dependencies: [] description: This package provides a command line tool and rubygem library for connecting a client system to the SUSE Customer Center. It will connect the system to your @@ -39,6 +39,7 @@ - lib/suse/connect/hwinfo/x86.rb - lib/suse/connect/logger.rb - lib/suse/connect/migration.rb +- lib/suse/connect/package_search.rb - lib/suse/connect/product.rb - lib/suse/connect/remote/activation.rb - lib/suse/connect/remote/product.rb

1 0

commit yast2-trans for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '18

26 Apr '18

Hello community, here is the log from the commit of package yast2-trans for openSUSE:Factory checked in at 2018-04-26 13:31:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-trans (Old) and /work/SRC/openSUSE:Factory/.yast2-trans.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-trans" Thu Apr 26 13:31:05 2018 rev:138 rq:600626 version:84.87.20180424.7ac5bcf28 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-trans/yast2-trans.changes 2018-04-07 20:52:22.928542781 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-trans.new/yast2-trans.changes 2018-04-26 13:31:07.943247780 +0200 @@ -1,0 +2,74 @@ +Tue Apr 24 12:27:28 UTC 2018 - git(a)opensuse.org + +- Update to version 84.87.20180424.7ac5bcf28: + * Installation Proposal BiDi fix (bsc#1089846) + * New POT for text domain 'control'. + * New POT for text domain 'ftp-server'. + * New POT for text domain 'installation'. + * New POT for text domain 'kdump'. + * New POT for text domain 'network'. + * New POT for text domain 'ntp-client'. + * New POT for text domain 'packager'. + * New POT for text domain 'printer'. + * New POT for text domain 'qt'. + * New POT for text domain 'storage'. + * Translated using Weblate (Arabic) + * Translated using Weblate (Catalan) + * Translated using Weblate (Chinese (China)) + * Translated using Weblate (Chinese (Taiwan)) + * Translated using Weblate (Czech) + * Translated using Weblate (Danish) + * Translated using Weblate (Dutch) + * Translated using Weblate (French) + * Translated using Weblate (German) + * Translated using Weblate (Italian) + * Translated using Weblate (Japanese) + * Translated using Weblate (Korean) + * Translated using Weblate (Polish) + * Translated using Weblate (Portuguese (Brazil)) + * Translated using Weblate (Russian) + * Translated using Weblate (Slovak) + * Translated using Weblate (Swedish) + +------------------------------------------------------------------- +Thu Apr 19 15:36:23 UTC 2018 - git(a)opensuse.org + +- Update to version 84.87.20180419.90ee29c0b: + * Added translation using Weblate (Hindi) + * Fixed some Japanese translations (bsc#1068360, bsc#1088571). + * Fixed string format (bsc#1088113). + * New POT for text domain 'autoinst'. + * New POT for text domain 'base'. + * New POT for text domain 'control'. + * New POT for text domain 'installation'. + * New POT for text domain 'iscsi-lio-server'. + * New POT for text domain 'nfs'. + * New POT for text domain 'ntp-client'. + * New POT for text domain 'packager'. + * New POT for text domain 'registration'. + * New POT for text domain 'relocation-server'. + * New POT for text domain 'storage'. + * New POT for text domain 'users'. + * New POT for text domain 'vm'. + * Translated using Weblate (Arabic) + * Translated using Weblate (Catalan) + * Translated using Weblate (Chinese (China)) + * Translated using Weblate (Chinese (Taiwan)) + * Translated using Weblate (Czech) + * Translated using Weblate (Dutch) + * Translated using Weblate (French) + * Translated using Weblate (German) + * Translated using Weblate (Hindi) + * Translated using Weblate (Hungarian) + * Translated using Weblate (Italian) + * Translated using Weblate (Japanese) + * Translated using Weblate (Korean) + * Translated using Weblate (Polish) + * Translated using Weblate (Portuguese (Brazil)) + * Translated using Weblate (Russian) + * Translated using Weblate (Slovak) + * Translated using Weblate (Spanish) + * Translated using Weblate (Swedish) + * Translated using Weblate (Ukrainian) + +------------------------------------------------------------------- @@ -1686,2 +1759,0 @@ - - Old: ---- yast2-trans-84.87.20180406.01ef53789.tar.xz New: ---- yast2-trans-84.87.20180424.7ac5bcf28.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans.spec ++++++ --- /var/tmp/diff_new_pack.GBoD73/_old 2018-04-26 13:31:08.871213787 +0200 +++ /var/tmp/diff_new_pack.GBoD73/_new 2018-04-26 13:31:08.875213640 +0200 @@ -17,7 +17,7 @@ Name: yast2-trans -Version: 84.87.20180406.01ef53789 +Version: 84.87.20180424.7ac5bcf28 Release: 0 Summary: YaST2 - Translation Container Package License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.GBoD73/_old 2018-04-26 13:31:08.947211003 +0200 +++ /var/tmp/diff_new_pack.GBoD73/_new 2018-04-26 13:31:08.947211003 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/yast/yast-translations.git</param> - <param name="changesrevision">f72264a902fae73097ffb4b1e6df7f1141d303a4</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">7ac5bcf28ee254efb0378df73d1edcc310b1ce1b</param></service></servicedata> \ No newline at end of file ++++++ yast2-trans-84.87.20180406.01ef53789.tar.xz -> yast2-trans-84.87.20180424.7ac5bcf28.tar.xz ++++++ /work/SRC/openSUSE:Factory/yast2-trans/yast2-trans-84.87.20180406.01ef53789.tar.xz /work/SRC/openSUSE:Factory/.yast2-trans.new/yast2-trans-84.87.20180424.7ac5bcf28.tar.xz differ: char 26, line 1

1 0

commit yast2-firewall for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '18

26 Apr '18

Hello community, here is the log from the commit of package yast2-firewall for openSUSE:Factory checked in at 2018-04-26 13:30:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-firewall (Old) and /work/SRC/openSUSE:Factory/.yast2-firewall.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-firewall" Thu Apr 26 13:30:56 2018 rev:66 rq:600112 version:4.0.24 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-firewall/yast2-firewall.changes 2018-04-07 20:50:58.703591143 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-firewall.new/yast2-firewall.changes 2018-04-26 13:30:58.131607201 +0200 @@ -1,0 +2,14 @@ +Sat Apr 21 07:35:42 UTC 2018 - knut.anderssen(a)suse.com + +- During installation, open services defined by (Tigervnc) instead + of the 'vnc-server' service that is shipped with (firewalld) + (bsc#1081952). +- 4.0.24 + +------------------------------------------------------------------- +Tue Apr 17 11:55:47 CEST 2018 - snwint(a)suse.de + +- consistent wording (open/block) also for VNC ports (bsc#1089789) +- 4.0.23 + +------------------------------------------------------------------- Old: ---- yast2-firewall-4.0.22.tar.bz2 New: ---- yast2-firewall-4.0.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.8YZDIm/_old 2018-04-26 13:30:58.619589326 +0200 +++ /var/tmp/diff_new_pack.8YZDIm/_new 2018-04-26 13:30:58.619589326 +0200 @@ -17,7 +17,7 @@ Name: yast2-firewall -Version: 4.0.22 +Version: 4.0.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-firewall-4.0.22.tar.bz2 -> yast2-firewall-4.0.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.0.22/package/yast2-firewall.changes new/yast2-firewall-4.0.24/package/yast2-firewall.changes --- old/yast2-firewall-4.0.22/package/yast2-firewall.changes 2018-03-27 14:19:20.000000000 +0200 +++ new/yast2-firewall-4.0.24/package/yast2-firewall.changes 2018-04-23 17:57:11.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Sat Apr 21 07:35:42 UTC 2018 - knut.anderssen(a)suse.com + +- During installation, open services defined by (Tigervnc) instead + of the 'vnc-server' service that is shipped with (firewalld) + (bsc#1081952). +- 4.0.24 + +------------------------------------------------------------------- +Tue Apr 17 11:55:47 CEST 2018 - snwint(a)suse.de + +- consistent wording (open/block) also for VNC ports (bsc#1089789) +- 4.0.23 + +------------------------------------------------------------------- Tue Mar 27 12:02:55 UTC 2018 - knut.anderssen(a)suse.com - Translate the installation finish client title (bsc#1084136) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.0.22/package/yast2-firewall.spec new/yast2-firewall-4.0.24/package/yast2-firewall.spec --- old/yast2-firewall-4.0.22/package/yast2-firewall.spec 2018-03-27 14:19:20.000000000 +0200 +++ new/yast2-firewall-4.0.24/package/yast2-firewall.spec 2018-04-23 17:57:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-firewall -Version: 4.0.22 +Version: 4.0.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.0.22/src/lib/y2firewall/clients/installation_finish.rb new/yast2-firewall-4.0.24/src/lib/y2firewall/clients/installation_finish.rb --- old/yast2-firewall-4.0.22/src/lib/y2firewall/clients/installation_finish.rb 2018-03-27 14:19:20.000000000 +0200 +++ new/yast2-firewall-4.0.24/src/lib/y2firewall/clients/installation_finish.rb 2018-04-23 17:57:11.000000000 +0200 @@ -54,9 +54,15 @@ def write Service.Enable("sshd") if @settings.enable_sshd + configure_firewall if @firewalld.installed? + true + end - return true if !(a)firewalld.installed? + private + # Modifies the configuration of the firewall according to the current + # settings + def configure_firewall @settings.enable_firewall ? @firewalld.enable! : @firewalld.disable! if @settings.open_ssh @@ -65,9 +71,14 @@ @firewalld.api.remove_service(@settings.default_zone, "ssh") end - @firewalld.api.add_service(@settings.default_zone, "vnc-server") if @settings.open_vnc - - true + if @settings.open_vnc + if @firewalld.api.service_supported?("tigervnc") + @firewalld.api.add_service(@settings.default_zone, "tigervnc") + @firewalld.api.add_service(@settings.default_zone, "tigervnc-https") + else + log.error "tigervnc service definition is not available" + end + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.0.22/src/lib/y2firewall/clients/proposal.rb new/yast2-firewall-4.0.24/src/lib/y2firewall/clients/proposal.rb --- old/yast2-firewall-4.0.22/src/lib/y2firewall/clients/proposal.rb 2018-03-27 14:19:20.000000000 +0200 +++ new/yast2-firewall-4.0.24/src/lib/y2firewall/clients/proposal.rb 2018-04-23 17:57:11.000000000 +0200 @@ -128,7 +128,7 @@ return nil unless Linuxrc.vnc if @settings.open_vnc - _("VNC ports will be open (<a href=\"%s\">close</a>)") % LINK_CLOSE_VNC + _("VNC ports will be open (<a href=\"%s\">block</a>)") % LINK_CLOSE_VNC else _("VNC ports will be blocked (<a href=\"%s\">open</a>)") % LINK_OPEN_VNC end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.0.22/src/lib/y2firewall/importer_strategies/firewalld.rb new/yast2-firewall-4.0.24/src/lib/y2firewall/importer_strategies/firewalld.rb --- old/yast2-firewall-4.0.22/src/lib/y2firewall/importer_strategies/firewalld.rb 2018-03-27 14:19:20.000000000 +0200 +++ new/yast2-firewall-4.0.24/src/lib/y2firewall/importer_strategies/firewalld.rb 2018-04-23 17:57:11.000000000 +0200 @@ -19,6 +19,7 @@ # current contact information at www.suse.com. # ------------------------------------------------------------------------------ +require "yast" require "y2firewall/firewalld" module Y2Firewall @@ -27,6 +28,7 @@ # firewalld schema is used configuring the Y2Firewall::Firewalld instance # according to it. class Firewalld + include Yast::Logger # [Hash] AutoYaST profile firewall's section attr_reader :profile @@ -45,6 +47,7 @@ def import return true if profile.empty? profile.fetch("zones", []).each do |zone| + log.debug "Proccesing zone: #{zone.inspect}" process_zone(zone) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.0.22/test/lib/y2firewall/clients/installation_finish_test.rb new/yast2-firewall-4.0.24/test/lib/y2firewall/clients/installation_finish_test.rb --- old/yast2-firewall-4.0.22/test/lib/y2firewall/clients/installation_finish_test.rb 2018-03-27 14:19:20.000000000 +0200 +++ new/yast2-firewall-4.0.24/test/lib/y2firewall/clients/installation_finish_test.rb 2018-04-23 17:57:11.000000000 +0200 @@ -6,6 +6,9 @@ Yast.import "Service" describe Y2Firewall::Clients::InstallationFinish do + let(:proposal_settings) { Y2Firewall::ProposalSettings.instance } + let(:firewalld) { Y2Firewall::Firewalld.instance } + describe "#title" do it "returns translated string" do expect(subject.title).to be_a(::String) @@ -19,21 +22,13 @@ end describe "#write" do - let(:proposal_settings) { Y2Firewall::ProposalSettings.instance } - let(:api) do - instance_double(Y2Firewall::Firewalld::Api, remove_service: true, add_service: true) - end - let(:firewalld) { Y2Firewall::Firewalld.instance } let(:enable_sshd) { false } - let(:enable_firewall) { false } let(:installed) { true } before do - allow(proposal_settings).to receive("enable_sshd").and_return enable_sshd - allow(proposal_settings).to receive("enable_firewall").and_return enable_firewall - allow(firewalld).to receive("api").and_return api - allow(firewalld).to receive("installed?").and_return installed - allow(proposal_settings).to receive("open_ssh").and_return false + allow(proposal_settings).to receive("enable_sshd").and_return(enable_sshd) + allow(firewalld).to receive("installed?").and_return(installed) + allow(proposal_settings).to receive("open_ssh").and_return(false) end it "enables the sshd service if enabled in the proposal" do @@ -47,48 +42,90 @@ let(:installed) { false } it "returns true" do + expect(subject).to_not receive(:configure_firewall) expect(subject.write).to eq true end end context "when firewalld is installed" do - it "enables the firewalld service if enabled in the proposal" do - allow(proposal_settings).to receive("enable_firewall").and_return(true) - expect(firewalld).to receive("enable!") + it "configures the firewall according to the proposal settings" do + expect(subject).to receive(:configure_firewall) subject.write end - it "disables the firewalld service if disabled in the proposal" do - expect(firewalld).to receive("disable!") - - subject.write + it "returns true" do + expect(subject.write).to eq true end + end + end - it "adds the ssh service to the public zone if opened in the proposal" do - expect(proposal_settings).to receive("open_ssh").and_return(true) - expect(firewalld.api).to receive(:add_service).with("public", "ssh") + describe "#configure_firewall" do + let(:enable_firewall) { false } + let(:api) do + instance_double(Y2Firewall::Firewalld::Api, remove_service: true, add_service: true) + end - subject.write - end + before do + allow(proposal_settings).to receive("enable_firewall").and_return(enable_firewall) + allow(firewalld).to receive("api").and_return(api) + allow(firewalld).to receive("enable!") + allow(firewalld).to receive("disable!") + allow(proposal_settings).to receive("open_ssh").and_return(false) + end - it "removes the ssh service from the public zone if blocked in the proposal" do - expect(firewalld.api).to receive(:remove_service).with("public", "ssh") + it "enables the firewalld service if enabled in the proposal" do + allow(proposal_settings).to receive("enable_firewall").and_return(true) + expect(firewalld).to receive("enable!") - subject.write + subject.send(:configure_firewall) + end + + it "disables the firewalld service if disabled in the proposal" do + expect(firewalld).to receive("disable!") + + subject.send(:configure_firewall) + end + + it "adds the ssh service to the default zone if opened in the proposal" do + expect(proposal_settings).to receive("open_ssh").and_return(true) + expect(api).to receive(:add_service).with(proposal_settings.default_zone, "ssh") + + subject.send(:configure_firewall) + end + + it "removes the ssh service from the default zone if blocked in the proposal" do + expect(api).to receive(:remove_service).with(proposal_settings.default_zone, "ssh") + + subject.send(:configure_firewall) + end + + context "when vnc is proposed to be open" do + let(:service_available) { true } + + before do + allow(proposal_settings).to receive("open_vnc").and_return(true) + allow(api).to receive(:service_supported?).with("tigervnc").and_return(service_available) end - it "adds the vnc service to the public zone if opened in the proposal" do - allow(proposal_settings).to receive("open_vnc").and_return true - expect(firewalld.api).to receive(:add_service).with("public", "vnc-server") + context "and the tigervnc service definition is available" do + it "adds the tigervnc and the tigervnc-https services to the default zone" do + expect(api).to receive(:add_service).with(proposal_settings.default_zone, "tigervnc") + expect(api).to receive(:add_service) + .with(proposal_settings.default_zone, "tigervnc-https") - subject.write + subject.send(:configure_firewall) + end end - it "returns true" do - expect(subject.write).to eq true + context "and the tigervnc service definition is not available" do + let(:service_available) { false } + it "logs the error" do + expect(subject.log).to receive(:error).with(/service definition is not available/) + + subject.send(:configure_firewall) + end end end - end end

1 0

commit rubygem-yast-rake for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '18

26 Apr '18

Hello community, here is the log from the commit of package rubygem-yast-rake for openSUSE:Factory checked in at 2018-04-26 13:30:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-yast-rake (Old) and /work/SRC/openSUSE:Factory/.rubygem-yast-rake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-yast-rake" Thu Apr 26 13:30:48 2018 rev:21 rq:600098 version:0.2.22 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-yast-rake/rubygem-yast-rake.changes 2018-01-17 21:42:23.587908516 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-yast-rake.new/rubygem-yast-rake.changes 2018-04-26 13:30:50.111900977 +0200 @@ -1,0 +2,21 @@ +Thu Apr 19 08:56:23 UTC 2018 - jreidinger(a)suse.com + +- add SLE12 SP4 as target and switch sle_latest to nil for now + until IBS create project for SLE15 SP1. (bsc#1044312) +- 0.2.22 + +------------------------------------------------------------------- +Tue Apr 10 10:16:27 UTC 2018 - lslezak(a)suse.cz + +- Install also the custom icons in "rake install" (by wstephenson) + (bsc#1088844) +- 0.2.21 + +------------------------------------------------------------------- +Thu Jan 18 14:22:03 UTC 2018 - igonzalezsosa(a)suse.com + +- Use old fillup-templates for openSUSE/SLE prior to 15 + (bsc#1076602) +- 0.2.20 + +------------------------------------------------------------------- Old: ---- yast-rake-0.2.19.gem New: ---- yast-rake-0.2.22.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-yast-rake.spec ++++++ --- /var/tmp/diff_new_pack.Edfj74/_old 2018-04-26 13:30:50.575883980 +0200 +++ /var/tmp/diff_new_pack.Edfj74/_new 2018-04-26 13:30:50.579883834 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-yast-rake # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: rubygem-yast-rake -Version: 0.2.19 +Version: 0.2.22 Release: 0 %define mod_name yast-rake %define mod_full_name %{mod_name}-%{version} @@ -28,7 +28,7 @@ Url: http://github.org/openSUSE/yast-rake Source: http://rubygems.org/gems/%{mod_full_name}.gem Summary: Rake tasks providing basic work-flow for Yast development -License: LGPL-2.1 +License: LGPL-2.1-only Group: Development/Languages/Ruby %description ++++++ yast-rake-0.2.19.gem -> yast-rake-0.2.22.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/VERSION new/VERSION --- old/VERSION 2016-11-09 17:49:23.000000000 +0100 +++ new/VERSION 2018-04-11 12:13:28.000000000 +0200 @@ -1 +1 @@ -0.2.19 +0.2.22 Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/data/targets.yml new/data/targets.yml --- old/data/targets.yml 2016-11-09 17:49:23.000000000 +0100 +++ new/data/targets.yml 2018-04-11 12:13:28.000000000 +0200 @@ -50,15 +50,20 @@ obs_api: "https://api.opensuse.org" obs_project: "YaST:SLE-12:SP3" obs_target: "SLE_12_SP3" +:sle12sp4: + obs_api: "https://api.suse.de/" + obs_project: "Devel:YaST:SLE-12-SP4" + obs_sr_project: "SUSE:SLE-12-SP4:GA" + obs_target: "SLE_12_SP4" :sle15: obs_api: "https://api.suse.de/" - obs_project: "Devel:YaST:Head" + obs_project: "Devel:YaST:SLE-15" obs_sr_project: "SUSE:SLE-15:GA" obs_target: "SUSE_SLE-15_GA" :sle_latest: obs_api: "https://api.suse.de/" obs_project: "Devel:YaST:Head" - obs_sr_project: "SUSE:SLE-15:GA" + obs_sr_project: nil obs_target: "SUSE_SLE-15_GA" :factory: obs_project: "YaST:Head" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/install.rake new/lib/tasks/install.rake --- old/lib/tasks/install.rake 2016-11-09 17:49:23.000000000 +0100 +++ new/lib/tasks/install.rake 2018-04-11 12:13:28.000000000 +0200 @@ -26,9 +26,9 @@ DESTDIR = ENV["DESTDIR"] || "/" YAST_DIR = DESTDIR + "/usr/share/YaST2/" YAST_LIB_DIR = DESTDIR + "/usr/lib/YaST2/" + YAST_ICON_BASE_DIR = DESTDIR + "/usr/share/YaST2/theme/current/icons" YAST_DESKTOP_DIR = DESTDIR + "/usr/share/applications/YaST2/" AUTOYAST_RNC_DIR = YAST_DIR + "schema/autoyast/rnc/" - FILLUP_DIR = DESTDIR + "/usr/share/fillup-templates/" # specific directory that contain dynamic part of package name def install_doc_dir @@ -49,11 +49,22 @@ "**/src/servers_non_y2" => YAST_LIB_DIR, "**/src/bin" => YAST_LIB_DIR, "**/src/autoyast[_-]rnc/*" => AUTOYAST_RNC_DIR, - "**/src/fillup/*" => FILLUP_DIR, + "**/src/fillup/*" => fillup_dir, "**/src/desktop/*.desktop" => YAST_DESKTOP_DIR, - "{README*,COPYING,CONTRIBUTING.md}" => install_doc_dir + "{README*,COPYING,CONTRIBUTING.md}" => install_doc_dir, + "**/icons/*" => YAST_ICON_BASE_DIR } end + + # Possible fillup templates directories + FILLUP_DIRS = ["/usr/share/fillup-templates", "/var/adm/fillup-templates"].freeze + + # @return [String] fillup-templates directory + def fillup_dir + found = FILLUP_DIRS.find { |d| Dir.exist?(d) } + reldir = found || FILLUP_DIRS.first + DESTDIR + reldir + end end end @@ -68,7 +79,7 @@ # exists and we copy a symlink sh "cp -r '#{source}' '#{install_to}'" rescue => e - raise "Cannot instal file #{source} to #{install_to}: #{e.message}" + raise "Cannot install file #{source} to #{install_to}: #{e.message}" end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2017-11-30 12:07:32.000000000 +0100 +++ new/metadata 2018-04-23 15:10:27.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: yast-rake version: !ruby/object:Gem::Version - version: 0.2.19 + version: 0.2.22 platform: ruby authors: - Josef Reidinger autorequire: bindir: bin cert_chain: [] -date: 2017-11-30 00:00:00.000000000 Z +date: 2018-04-23 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rake @@ -60,7 +60,7 @@ - lib/tasks/version.rake - lib/yast/rake.rb - lib/yast/tasks.rb -homepage: http://github.org/openSUSE/yast-rake +homepage: https://github.com/yast/yast-rake licenses: - LGPL v2.1 metadata: {} @@ -80,7 +80,7 @@ version: '0' requirements: [] rubyforge_project: -rubygems_version: 2.6.13 +rubygems_version: 2.7.3 signing_key: specification_version: 4 summary: Rake tasks providing basic work-flow for Yast development

1 0

commit yast2-kdump for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '18

26 Apr '18

Hello community, here is the log from the commit of package yast2-kdump for openSUSE:Factory checked in at 2018-04-26 13:30:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-kdump (Old) and /work/SRC/openSUSE:Factory/.yast2-kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-kdump" Thu Apr 26 13:30:39 2018 rev:89 rq:600019 version:4.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-kdump/yast2-kdump.changes 2018-02-07 18:18:21.484995803 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-kdump.new/yast2-kdump.changes 2018-04-26 13:30:40.792242368 +0200 @@ -1,0 +2,12 @@ +Thu Apr 19 22:55:41 UTC 2018 - jreidinger(a)suse.com + +- do not write crashkernel to XEN dom0 (bsc#1085626) +- 4.0.3 + +------------------------------------------------------------------- +Thu Apr 19 16:25:07 CEST 2018 - snwint(a)suse.de + +- log to /var/log/YaST2, not /var/lib/YaST2 (bsc#1090202) +- 4.0.2 + +------------------------------------------------------------------- Old: ---- yast2-kdump-4.0.1.tar.bz2 New: ---- yast2-kdump-4.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-kdump.spec ++++++ --- /var/tmp/diff_new_pack.eVagqw/_old 2018-04-26 13:30:41.276224639 +0200 +++ /var/tmp/diff_new_pack.eVagqw/_new 2018-04-26 13:30:41.276224639 +0200 @@ -17,7 +17,7 @@ Name: yast2-kdump -Version: 4.0.1 +Version: 4.0.3 Release: 0 Summary: Configuration of kdump License: GPL-2.0 ++++++ yast2-kdump-4.0.1.tar.bz2 -> yast2-kdump-4.0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-4.0.1/package/yast2-kdump.changes new/yast2-kdump-4.0.3/package/yast2-kdump.changes --- old/yast2-kdump-4.0.1/package/yast2-kdump.changes 2018-02-05 17:25:26.000000000 +0100 +++ new/yast2-kdump-4.0.3/package/yast2-kdump.changes 2018-04-23 14:28:14.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Apr 19 22:55:41 UTC 2018 - jreidinger(a)suse.com + +- do not write crashkernel to XEN dom0 (bsc#1085626) +- 4.0.3 + +------------------------------------------------------------------- +Thu Apr 19 16:25:07 CEST 2018 - snwint(a)suse.de + +- log to /var/log/YaST2, not /var/lib/YaST2 (bsc#1090202) +- 4.0.2 + +------------------------------------------------------------------- Mon Feb 05 14:57:23 CET 2018 - aschnell(a)suse.com - added supplements for yast2 and kdump (bsc#1070423) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-4.0.1/package/yast2-kdump.spec new/yast2-kdump-4.0.3/package/yast2-kdump.spec --- old/yast2-kdump-4.0.1/package/yast2-kdump.spec 2018-02-05 17:25:26.000000000 +0100 +++ new/yast2-kdump-4.0.3/package/yast2-kdump.spec 2018-04-23 14:28:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-kdump -Version: 4.0.1 +Version: 4.0.3 Release: 0 Summary: Configuration of kdump License: GPL-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-4.0.1/src/modules/Kdump.rb new/yast2-kdump-4.0.3/src/modules/Kdump.rb --- old/yast2-kdump-4.0.1/src/modules/Kdump.rb 2018-02-05 17:25:26.000000000 +0100 +++ new/yast2-kdump-4.0.3/src/modules/Kdump.rb 2018-04-23 14:28:14.000000000 +0200 @@ -274,7 +274,6 @@ # @return [Boolean] successfull def ReadKdumpKernelParam result = Bootloader.kernel_param(:common, "crashkernel") - result = Bootloader.kernel_param(:xen_guest, "crashkernel") if result == :missing xen_result = Bootloader.kernel_param(:xen_host, "crashkernel") # result could be [String,Array,:missing,:present] # String - the value of the only occurrence @@ -416,7 +415,7 @@ # @param update_command [String] a command for .target.bash # @return [Boolean] whether successful def update_initrd_with(update_command) - update_logfile = File.join(Directory.vardir, "y2logmkinitrd") + update_logfile = File.join(Directory.logdir, "y2logmkinitrd") run_command = update_command + " >> #{update_logfile} 2>&1" y2milestone("Running command: #{run_command}") @@ -496,7 +495,7 @@ Service.Enable(KDUMP_SERVICE_NAME) Service.Restart(KDUMP_SERVICE_NAME) if Service.active?(KDUMP_SERVICE_NAME) else - Bootloader.modify_kernel_params(:common, :xen_guest, :recovery, "crashkernel" => crash_values) + Bootloader.modify_kernel_params(:common, :recovery, "crashkernel" => crash_values) Bootloader.modify_kernel_params(:xen_host, "crashkernel" => crash_xen_values) # do mass write in installation to speed up, so skip this one if !Stage.initial @@ -1220,7 +1219,7 @@ else value = nil end - Bootloader.modify_kernel_params(:common, :xen_guest, :recovery, "fadump" => value) + Bootloader.modify_kernel_params(:common, :recovery, "fadump" => value) Bootloader.Write unless Yast::Stage.initial # do mass write in installation to speed up end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-4.0.1/test/kdump_test.rb new/yast2-kdump-4.0.3/test/kdump_test.rb --- old/yast2-kdump-4.0.1/test/kdump_test.rb 2018-02-05 17:25:26.000000000 +0100 +++ new/yast2-kdump-4.0.3/test/kdump_test.rb 2018-04-23 14:28:14.000000000 +0200 @@ -447,7 +447,7 @@ it "writes the crashkernel value to the bootloader and enables the service" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, "crashkernel" => ["the_value"]) + .with(:common, :recovery, "crashkernel" => ["the_value"]) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => ["xen_value"]) @@ -464,7 +464,7 @@ it "writes an empty crashkernel in the bootloader and enables the service" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, "crashkernel" => []) + .with(:common, :recovery, "crashkernel" => []) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => []) @@ -481,7 +481,7 @@ it "writes a proposed crashkernel in the bootloader and enables the service" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, "crashkernel" => bootlader_kernel_params) + .with(:common, :recovery, "crashkernel" => bootlader_kernel_params) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => bootlader_xen_kernel_params) @@ -512,7 +512,7 @@ it "writes the crashkernel value without removing the offset" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, "crashkernel" => ["72M@128"]) + .with(:common, :recovery, "crashkernel" => ["72M@128"]) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => ["72M@128"]) @@ -541,7 +541,7 @@ it "writes the crashkernel value to the bootloader and enables the service" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, "crashkernel" => ["the_value"]) + .with(:common, :recovery, "crashkernel" => ["the_value"]) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => ["xen_value"]) @@ -558,7 +558,7 @@ it "writes an empty crashkernel in the bootloader and enables the service" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, "crashkernel" => []) + .with(:common, :recovery, "crashkernel" => []) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => []) @@ -575,7 +575,7 @@ it "rewrites the bootloader crashkernel settings and enables the service" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, "crashkernel" => bootlader_kernel_params) + .with(:common, :recovery, "crashkernel" => bootlader_kernel_params) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => bootlader_xen_kernel_params) @@ -606,7 +606,7 @@ it "writes the crashkernel value without removing the offset" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, "crashkernel" => ["72M@128"]) + .with(:common, :recovery, "crashkernel" => ["72M@128"]) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => ["72M@128"]) @@ -634,7 +634,7 @@ it "updates crashkernel and enables service if crashkernel is changed" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, "crashkernel" => ["128M"]) + .with(:common, :recovery, "crashkernel" => ["128M"]) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => ["128M\\<4G"]) @@ -675,7 +675,7 @@ it "writes chrashkernel and enables the service if kdump was enabled" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, "crashkernel" => ["64M"]) + .with(:common, :recovery, "crashkernel" => ["64M"]) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => ["64M\\<4G"]) @@ -712,7 +712,7 @@ it "removes the range" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, {"crashkernel" => ["64M"]}) + .with(:common, :recovery, {"crashkernel" => ["64M"]}) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => ["64M\\<4G"]) @@ -749,7 +749,7 @@ it "removes the offset" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, {"crashkernel" => ["64M"]}) + .with(:common, :recovery, {"crashkernel" => ["64M"]}) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, "crashkernel" => ["64M\\<4G"]) @@ -763,7 +763,7 @@ it "removes the offset" do expect(Yast::Bootloader) .to receive(:modify_kernel_params) - .with(:common, :xen_guest, :recovery, {"crashkernel" => ["-512M:64M,512M-:128M"]}) + .with(:common, :recovery, {"crashkernel" => ["-512M:64M,512M-:128M"]}) expect(Yast::Bootloader) .to receive(:modify_kernel_params) .with(:xen_host, {"crashkernel" => ["-512M:64M,512M-:128M"]}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-4.0.1/test/test_helper.rb new/yast2-kdump-4.0.3/test/test_helper.rb --- old/yast2-kdump-4.0.1/test/test_helper.rb 2018-02-05 17:25:26.000000000 +0100 +++ new/yast2-kdump-4.0.3/test/test_helper.rb 2018-04-23 14:28:14.000000000 +0200 @@ -1,6 +1,7 @@ srcdir = File.expand_path("../../src", __FILE__) y2dirs = ENV.fetch("Y2DIR", "").split(":") ENV["Y2DIR"] = y2dirs.unshift(srcdir).join(":") +ENV["LC_ALL"] = "en_US.utf-8" require "yast" require "yast/rspec"

1 0

commit installation-images for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '18

26 Apr '18

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2018-04-26 13:30:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images" Thu Apr 26 13:30:30 2018 rev:43 rq:600018 version:14.370 Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2018-04-07 20:53:44.309597305 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2018-04-26 13:30:31.684575989 +0200 @@ -1,0 +2,37 @@ +Mon Apr 23 12:02:37 UTC 2018 - wfeldt(a)opensuse.org + +- merge gh#openSUSE/installation-images#245 +- remove last mozilla-nspr reference +- 14.370 + +-------------------------------------------------------------------- +Thu Apr 19 11:22:36 UTC 2018 - wfeldt(a)opensuse.org + +- merge gh#openSUSE/installation-images#244 +- remove dmraid from inst-sys (fate#323743, bsc#1088570) +- remove explicit dependency from mozilla-nspr +- 14.369 + +-------------------------------------------------------------------- +Wed Apr 18 12:57:09 UTC 2018 - wfeldt(a)opensuse.org + +- merge gh#openSUSE/installation-images#243 +- run postin script of yast2-storage-ng (bsc#1081198) +- 14.368 + +------------------------------------------------------------------- +Wed Apr 11 15:49:43 CEST 2018 - snwint(a)suse.de + +- disable Kubic 32-bit build (bsc#1089102) + +------------------------------------------------------------------- +Mon Apr 9 15:00:54 CEST 2018 - kukuk(a)suse.de + +- No upgrade option for Kubic (bsc#1088304) + +------------------------------------------------------------------- +Mon Apr 9 14:44:58 CEST 2018 - snwint(a)suse.de + +- do not delete efi image in skelcd-installer-net (bsc#1088679) + +-------------------------------------------------------------------- Old: ---- installation-images-14.367.tar.xz New: ---- installation-images-14.370.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.2Of2xE/_old 2018-04-26 13:30:32.392550055 +0200 +++ /var/tmp/diff_new_pack.2Of2xE/_new 2018-04-26 13:30:32.392550055 +0200 @@ -49,9 +49,11 @@ %if "%flavor" == "Kubic" # don't build on Leap for now %if 0%{?is_opensuse} && !0%{?sle_version} +%ifnarch %ix86 %define theme Kubic %endif %endif +%endif %if "%flavor" == "SLED" # build SLED only on x86_64 @@ -105,6 +107,7 @@ %define branding_plymouth openSUSE %define branding_grub2 openSUSE %define branding_gfxboot openSUSE +%define config_bootmenu_no_upgrade 1 BuildRequires: openSUSE-Tumbleweed-Kubic-release %endif @@ -508,7 +511,7 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.367 +Version: 14.370 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) @@ -664,7 +667,7 @@ # net cp -a %{buildroot}/usr/lib/skelcd/CD1 %{buildroot}/usr/lib/skelcd/NET rm -f %{buildroot}/usr/lib/skelcd/NET/boot/*/*.rpm -rm -f %{buildroot}/usr/lib/skelcd/NET/boot/*/{bind,common,config,control.xml,efi,gdb,libstoragemgmt,rescue,root} +rm -f %{buildroot}/usr/lib/skelcd/NET/boot/*/{bind,common,config,control.xml,gdb,libstoragemgmt,rescue,root} if [ -n "%{net_repo}" ] ; then CPU=%{_target_cpu} [ "$CPU" = i586 ] && CPU=i386 ++++++ installation-images-14.367.tar.xz -> installation-images-14.370.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.367/VERSION new/installation-images-14.370/VERSION --- old/installation-images-14.367/VERSION 2018-04-06 10:40:35.000000000 +0200 +++ new/installation-images-14.370/VERSION 2018-04-23 14:02:37.000000000 +0200 @@ -1 +1 @@ -14.367 +14.370 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.367/changelog new/installation-images-14.370/changelog --- old/installation-images-14.367/changelog 2018-04-06 10:40:35.000000000 +0200 +++ new/installation-images-14.370/changelog 2018-04-23 14:02:37.000000000 +0200 @@ -1,3 +1,13 @@ +2018-04-23: 14.370 + - remove last mozilla-nspr reference + +2018-04-19: 14.369 + - remove dmraid from inst-sys (fate #323743, bsc #1088570) + - remove explicit dependency from mozilla-nspr + +2018-04-18: 14.368 + - run postin script of yast2-storage-ng (bsc #1081198) + 2018-04-03: 14.367 - adjust adddir script to allow updating coreutils (bsc #1087901) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.367/data/rescue/rescue.file_list new/installation-images-14.370/data/rescue/rescue.file_list --- old/installation-images-14.367/data/rescue/rescue.file_list 2018-04-06 10:40:35.000000000 +0200 +++ new/installation-images-14.370/data/rescue/rescue.file_list 2018-04-23 14:02:37.000000000 +0200 @@ -125,7 +125,6 @@ krb5: lsscsi: mingetty: -mozilla-nspr: ncurses-utils: net-tools: ?net-tools-deprecated: @@ -314,7 +313,7 @@ rsyslog: util-linux: wicked: -dmraid: +?dmraid: mdadm: multipath-tools: nfs-client: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.367/data/root/root.file_list new/installation-images-14.370/data/root/root.file_list --- old/installation-images-14.367/data/root/root.file_list 2018-04-06 10:40:35.000000000 +0200 +++ new/installation-images-14.370/data/root/root.file_list 2018-04-23 14:02:37.000000000 +0200 @@ -124,7 +124,6 @@ cryptsetup: ?libcryptsetup*-hmac: device-mapper: -dmraid: dosfstools: e2fsprogs: fbiterm: @@ -150,7 +149,6 @@ libyui-qt-graph*: ?ltrace: lvm2: -mozilla-nspr: multipath-tools: net-tools: ?net-tools-deprecated: @@ -202,14 +200,6 @@ # avoid update-alternatives e cd usr/bin ; if [ -f vim-nox11 ] ; then ln -snf vim-nox11 vim ; fi -# either new yast storage or the old one -if exists(yast2-storage-ng) - yast2-storage-ng: - libstorage-ng-lang: - libstorage7: ignore - yast2-storage: ignore -endif - <release_theme>-release: nodeps # pull in yast2 installation related packages via package deps @@ -601,6 +591,7 @@ / E postin +# either new yast storage or the old one if !exists(yast2-storage-ng) yast2-storage: / @@ -609,6 +600,14 @@ libstorage*: / E postin +else + yast2-storage-ng: + / + E postin + + libstorage-ng-lang: + libstorage7: ignore + yast2-storage: ignore endif openssh: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.367/data/root/zenroot.file_list new/installation-images-14.370/data/root/zenroot.file_list --- old/installation-images-14.367/data/root/zenroot.file_list 2018-04-06 10:40:35.000000000 +0200 +++ new/installation-images-14.370/data/root/zenroot.file_list 2018-04-23 14:02:37.000000000 +0200 @@ -49,7 +49,7 @@ cpio: device-mapper: diffutils: -dmraid: +?dmraid: dosfstools: e2fsprogs: file:

1 0

commit libyui-qt for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '18

26 Apr '18

Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2018-04-26 13:30:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old) and /work/SRC/openSUSE:Factory/.libyui-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt" Thu Apr 26 13:30:19 2018 rev:47 rq:599964 version:2.49.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2018-02-14 09:19:00.326914277 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2018-04-26 13:30:20.804974511 +0200 @@ -1,0 +2,7 @@ +Wed Apr 18 14:03:01 UTC 2018 - igonzalezsosa(a)suse.com + +- Use QLibraryInfo to determine the path to Qt translations + (bsc#1082569). +- 2.49.2 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.49.1.tar.bz2 New: ---- libyui-qt-2.49.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.hbLJmV/_old 2018-04-26 13:30:21.300956344 +0200 +++ /var/tmp/diff_new_pack.hbLJmV/_new 2018-04-26 13:30:21.300956344 +0200 @@ -20,7 +20,7 @@ %define so_version 8 Name: %{parent}-doc -Version: 2.49.1 +Version: 2.49.2 Release: 0 Source: %{parent}-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.hbLJmV/_old 2018-04-26 13:30:21.320955611 +0200 +++ /var/tmp/diff_new_pack.hbLJmV/_new 2018-04-26 13:30:21.324955465 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.49.1 +Version: 2.49.2 Release: 0 Source: %{name}-%{version}.tar.bz2 ++++++ libyui-qt-2.49.1.tar.bz2 -> libyui-qt-2.49.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/VERSION.cmake new/libyui-qt-2.49.2/VERSION.cmake --- old/libyui-qt-2.49.1/VERSION.cmake 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/VERSION.cmake 2018-04-23 11:41:05.000000000 +0200 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "49") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is needed for the libyui-qt core ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/package/libyui-qt-doc.spec new/libyui-qt-2.49.2/package/libyui-qt-doc.spec --- old/libyui-qt-2.49.1/package/libyui-qt-doc.spec 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/package/libyui-qt-doc.spec 2018-04-23 11:41:05.000000000 +0200 @@ -20,7 +20,7 @@ %define so_version 8 Name: %{parent}-doc -Version: 2.49.1 +Version: 2.49.2 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/package/libyui-qt.changes new/libyui-qt-2.49.2/package/libyui-qt.changes --- old/libyui-qt-2.49.1/package/libyui-qt.changes 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/package/libyui-qt.changes 2018-04-23 11:41:05.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 18 14:03:01 UTC 2018 - igonzalezsosa(a)suse.com + +- Use QLibraryInfo to determine the path to Qt translations + (bsc#1082569). +- 2.49.2 + +------------------------------------------------------------------- Mon Jan 8 17:09:26 UTC 2018 - shundhammer(a)suse.com - Prevent segfault if an open dialog is left over (bsc#1074596): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/package/libyui-qt.spec new/libyui-qt-2.49.2/package/libyui-qt.spec --- old/libyui-qt-2.49.1/package/libyui-qt.spec 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/package/libyui-qt.spec 2018-04-23 11:41:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.49.1 +Version: 2.49.2 Release: 0 Source: %{name}-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/src/CMakeLists.txt new/libyui-qt-2.49.2/src/CMakeLists.txt --- old/libyui-qt-2.49.1/src/CMakeLists.txt 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/src/CMakeLists.txt 2018-04-23 11:41:05.000000000 +0200 @@ -7,7 +7,6 @@ set(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) add_definitions( -DICONDIR="${Y2QT_ICONDIR}" - -DQT_LOCALEDIR="${QT_TRANSLATIONS_DIR}" ) qt5_wrap_ui(${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.1/src/YQApplication.cc new/libyui-qt-2.49.2/src/YQApplication.cc --- old/libyui-qt-2.49.1/src/YQApplication.cc 2018-02-07 17:11:06.000000000 +0100 +++ new/libyui-qt-2.49.2/src/YQApplication.cc 2018-04-23 11:41:05.000000000 +0200 @@ -34,6 +34,7 @@ #include <QSettings> #include <QFontDatabase> #include <QMenu> +#include <QLibraryInfo> #include <fontconfig/fontconfig.h> @@ -120,7 +121,7 @@ void YQApplication::loadPredefinedQtTranslations() { - QString path = QT_LOCALEDIR; + QString path = QLibraryInfo::location(QLibraryInfo::TranslationsPath); QString language; if (glob_language == "") @@ -143,24 +144,15 @@ if ( ! _qtTranslations ) _qtTranslations = new QTranslator(); - _qtTranslations->load( transFile, path ); - - if ( _qtTranslations->isEmpty() ) - { - // try fallback - transFile = QString( "qt_%1.qm").arg( language.toLower().left(2) ); - _qtTranslations->load( transFile, path ); - } - - if ( _qtTranslations->isEmpty() ) + if ( !_qtTranslations->load( transFile, path ) ) { - yuiWarning() << "Can't load translations for predefined Qt dialogs from " - << path << "/" << transFile << std::endl; + yuiWarning() << "Can't load translations for predefined Qt dialogs for " + << language << std::endl; } else { - yuiMilestone() << "Loaded translations for predefined Qt dialogs from " - << path << "/" << transFile << std::endl; + yuiMilestone() << "Loaded translations for predefined Qt dialogs for " + << language << std::endl; qApp->installTranslator( _qtTranslations );

1 0

commit autoyast2 for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '18

26 Apr '18

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2018-04-26 13:30:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Thu Apr 26 13:30:09 2018 rev:242 rq:599931 version:4.0.49 Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2018-04-07 20:51:21.874752511 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2018-04-26 13:30:11.261324093 +0200 @@ -1,0 +2,26 @@ +Fri Apr 20 20:58:54 UTC 2018 - igonzalezsosa(a)suse.com + +- AutoYaST: properly handle empty proposals (bsc#1090390). +- 4.0.49 + +------------------------------------------------------------------- +Mon Apr 16 11:45:45 UTC 2018 - igonzalezsosa(a)suse.com + +- Probe storage devices again after initializing DASD or zFCP + devices (bsc#1089326 and bsc#1089554). +- 4.0.48 + +------------------------------------------------------------------- +Mon Apr 16 07:53:36 UTC 2018 - lslezak(a)suse.cz + +- Install the module products also in AutoYaST autoupgrade + (related to bsc#1086818 and bsc#1087206) +- 4.0.47 + +------------------------------------------------------------------- +Fri Apr 13 13:47:51 UTC 2018 - igonzalezsosa(a)suse.com + +- Honor partitioning settings from product (bsc#1085755). +- 4.0.46 + +------------------------------------------------------------------- Old: ---- autoyast2-4.0.45.tar.bz2 New: ---- autoyast2-4.0.49.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.o9uG9j/_old 2018-04-26 13:30:11.805304168 +0200 +++ /var/tmp/diff_new_pack.o9uG9j/_new 2018-04-26 13:30:11.809304021 +0200 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.0.45 +Version: 4.0.49 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,8 +48,8 @@ BuildRequires: yast2-transfer BuildRequires: yast2-update >= 3.3.0 BuildRequires: yast2-xml -# ActivateCallbacks::multipath signature -BuildRequires: yast2-storage-ng >= 4.0.116 +# AutoinstIssues::NoProposal +BuildRequires: yast2-storage-ng >= 4.0.160 # %%{_unitdir} macro definition is in a separate package since 13.1 %if 0%{?suse_version} >= 1310 @@ -69,8 +69,8 @@ Requires: yast2-schema Requires: yast2-transfer >= 2.21.0 Requires: yast2-xml -# Y2Storage::AutoinstProfile::SkipListValue#to_hash -Requires: yast2-storage-ng >= 4.0.23 +# AutoinstIssues::NoProposal +Requires: yast2-storage-ng >= 4.0.160 Conflicts: yast2-installation < 3.1.166 Provides: yast2-config-autoinst ++++++ autoyast2-4.0.45.tar.bz2 -> autoyast2-4.0.49.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.45/package/autoyast2.changes new/autoyast2-4.0.49/package/autoyast2.changes --- old/autoyast2-4.0.45/package/autoyast2.changes 2018-04-03 17:46:54.000000000 +0200 +++ new/autoyast2-4.0.49/package/autoyast2.changes 2018-04-23 11:08:21.000000000 +0200 @@ -1,4 +1,30 @@ ------------------------------------------------------------------- +Fri Apr 20 20:58:54 UTC 2018 - igonzalezsosa(a)suse.com + +- AutoYaST: properly handle empty proposals (bsc#1090390). +- 4.0.49 + +------------------------------------------------------------------- +Mon Apr 16 11:45:45 UTC 2018 - igonzalezsosa(a)suse.com + +- Probe storage devices again after initializing DASD or zFCP + devices (bsc#1089326 and bsc#1089554). +- 4.0.48 + +------------------------------------------------------------------- +Mon Apr 16 07:53:36 UTC 2018 - lslezak(a)suse.cz + +- Install the module products also in AutoYaST autoupgrade + (related to bsc#1086818 and bsc#1087206) +- 4.0.47 + +------------------------------------------------------------------- +Fri Apr 13 13:47:51 UTC 2018 - igonzalezsosa(a)suse.com + +- Honor partitioning settings from product (bsc#1085755). +- 4.0.46 + +------------------------------------------------------------------- Tue Apr 3 10:43:16 UTC 2018 - jlopez(a)suse.com - Fix tests to use correct storage instance (part of fate#318196). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.45/package/autoyast2.spec new/autoyast2-4.0.49/package/autoyast2.spec --- old/autoyast2-4.0.45/package/autoyast2.spec 2018-04-03 17:46:54.000000000 +0200 +++ new/autoyast2-4.0.49/package/autoyast2.spec 2018-04-23 11:08:21.000000000 +0200 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.0.45 +Version: 4.0.49 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,8 +48,8 @@ BuildRequires: yast2-update >= 3.3.0 BuildRequires: yast2-slp BuildRequires: yast2-country -# ActivateCallbacks::multipath signature -BuildRequires: yast2-storage-ng >= 4.0.116 +# AutoinstIssues::NoProposal +BuildRequires: yast2-storage-ng >= 4.0.160 # %%{_unitdir} macro definition is in a separate package since 13.1 %if 0%{?suse_version} >= 1310 @@ -69,8 +69,8 @@ Requires: yast2-schema Requires: yast2-transfer >= 2.21.0 Requires: yast2-xml -# Y2Storage::AutoinstProfile::SkipListValue#to_hash -Requires: yast2-storage-ng >= 4.0.23 +# AutoinstIssues::NoProposal +Requires: yast2-storage-ng >= 4.0.160 Conflicts: yast2-installation < 3.1.166 Provides: yast2-config-autoinst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.45/src/clients/inst_autosetup.rb new/autoyast2-4.0.49/src/clients/inst_autosetup.rb --- old/autoyast2-4.0.45/src/clients/inst_autosetup.rb 2018-04-03 17:46:54.000000000 +0200 +++ new/autoyast2-4.0.49/src/clients/inst_autosetup.rb 2018-04-23 11:08:21.000000000 +0200 @@ -135,6 +135,9 @@ # Progress.NextStage + # Merging selected product + AutoinstSoftware.merge_product(AutoinstFunctions.selected_product) + # configure general settings AutoinstGeneral.Import(Ops.get_map(Profile.current, "general", {})) Builtins.y2milestone( @@ -159,7 +162,7 @@ elsif !AutoinstConfig.second_stage() # Second stage of installation will not be called but a # network configuration is available. So this will be written - # while the general inst_finish process at the end of the + # during the general inst_finish process at the end of the # first stage. But for the installation workflow the linuxrc # network settings will be taken. (bnc#944942) Builtins.y2milestone( @@ -255,7 +258,8 @@ # moved here from autoinit for fate #301193 # needs testing - if Arch.s390 && AutoinstConfig.remoteProfile == true + s390_and_remote_profile = Arch.s390 && AutoinstConfig.remoteProfile == true + if s390_and_remote_profile Builtins.y2milestone("arch=s390 and remote_profile=true") if Builtins.haskey(Profile.current, "dasd") Builtins.y2milestone("dasd found") @@ -274,7 +278,7 @@ Progress.NextStage - probe_storage if modified_profile? + probe_storage if modified_profile? || s390_and_remote_profile if Profile.current["partitioning_advanced"] && !Profile.current["partitioning_advanced"].empty? write_storage = AutoinstStorage.ImportAdvanced(Profile.current["partitioning_advanced"]) @@ -304,7 +308,7 @@ # Bootloader # The bootloader has to be called before software selection. - # So the software selection can take care about packages + # So the software selection is aware and can manage packages # needed by the bootloader (bnc#876161) return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort @@ -322,7 +326,7 @@ Progress.NextStage # The configuration_management has to be called before software selection. - # So the software selection can take care about packages + # So the software selection is aware and can manage packages # needed by the configuration_management. if Profile.current["configuration_management"] return :abort unless WFM.CallFunction( @@ -357,16 +361,13 @@ Progress.NextStage - # Merging selected product - AutoinstSoftware.merge_product(AutoinstFunctions.selected_product) - # Evaluating package and patterns selection. - # Selection will stored in PackageAI. + # Selection will be stored in PackageAI. AutoinstSoftware.Import(Ops.get_map(Profile.current, "software", {})) # Add additional packages in order to run YAST modules which - # has been defined the AutoYaST configuration file. - # Selection will stored in PackageAI. + # have been defined in the AutoYaST configuration file. + # Selection will be stored in PackageAI. add_yast2_dependencies if AutoinstFunctions.second_stage_required? # Adding selections (defined in PackageAI) to libzypp and solving diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.45/src/clients/inst_autosetup_upgrade.rb new/autoyast2-4.0.49/src/clients/inst_autosetup_upgrade.rb --- old/autoyast2-4.0.45/src/clients/inst_autosetup_upgrade.rb 2018-04-03 17:46:54.000000000 +0200 +++ new/autoyast2-4.0.49/src/clients/inst_autosetup_upgrade.rb 2018-04-23 11:08:21.000000000 +0200 @@ -300,11 +300,8 @@ if !Update.did_init1 Update.did_init1 = true - Pkg.PkgApplReset - # bnc #300540 # bnc #391785 - # Drops packages after PkgApplReset, not before (that would null that) Update.DropObsoletePackages # make sure the packages needed for accessing the installation repository diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.45/src/lib/autoinstall/storage_proposal.rb new/autoyast2-4.0.49/src/lib/autoinstall/storage_proposal.rb --- old/autoyast2-4.0.45/src/lib/autoinstall/storage_proposal.rb 2018-04-03 17:46:54.000000000 +0200 +++ new/autoyast2-4.0.49/src/lib/autoinstall/storage_proposal.rb 2018-04-23 11:08:21.000000000 +0200 @@ -86,8 +86,6 @@ # # * {Y2Storage::GuidedProposal} if {partitioning} is nil or empty; # * {Y2Storage::AutoinstProposal} in any other case. - # - # @return [Y2Storage::GuidedProposal,Y2Storage::AutoinstProposal] Proposal instance def build_proposal(partitioning) if partitioning.nil? || partitioning.empty? @proposal = guided_proposal @@ -95,6 +93,7 @@ @proposal = autoinst_proposal(partitioning) @proposal.propose end + issues_list.add(:no_proposal) unless @proposal.devices rescue Y2Storage::Error => e handle_exception(e) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.45/src/modules/AutoinstStorage.rb new/autoyast2-4.0.49/src/modules/AutoinstStorage.rb --- old/autoyast2-4.0.45/src/modules/AutoinstStorage.rb 2018-04-03 17:46:54.000000000 +0200 +++ new/autoyast2-4.0.49/src/modules/AutoinstStorage.rb 2018-04-23 11:08:21.000000000 +0200 @@ -85,7 +85,8 @@ general_settings.delete("btrfs_set_default_subvolume_name") # Override product settings from control file - Yast::ProductFeatures.SetSection("partitioning", general_settings) + control_settings = Yast::ProductFeatures.GetSection("partitioning") || {} + Yast::ProductFeatures.SetSection("partitioning", control_settings.merge(general_settings)) end # Import Fstab data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.45/test/autoinst_storage_test.rb new/autoyast2-4.0.49/test/autoinst_storage_test.rb --- old/autoyast2-4.0.45/test/autoinst_storage_test.rb 2018-04-03 17:46:54.000000000 +0200 +++ new/autoyast2-4.0.49/test/autoinst_storage_test.rb 2018-04-23 11:08:21.000000000 +0200 @@ -188,30 +188,33 @@ describe "#import_general_settings" do let(:profile) { { "proposal_lvm" => true } } + let(:partitioning_features) { {"btrfs_default_subvolume" => "@" } } - it "overrides control file values" do - expect(Yast::ProductFeatures).to receive(:SetSection) - .with("partitioning", profile) - subject.import_general_settings(profile) + around do |example| + old_partitioning = Yast::ProductFeatures.GetSection("partitioning") + Yast::ProductFeatures.SetSection("partitioning", partitioning_features) + example.call + Yast::ProductFeatures.SetSection("partitioning", old_partitioning) end - context "when multipath is enabled" do - let(:profile) { { "start_multipath" => true } } - - it "sets multipath" + it "overrides control file values" do + subject.import_general_settings(profile) + expect(Yast::ProductFeatures.GetSection("partitioning")).to include("proposal_lvm" => true) end - context "when multipath is not enabled" do - it "does not set multipath" + it "keeps not overriden values" do + subject.import_general_settings(profile) + expect(Yast::ProductFeatures.GetSection("partitioning")) + .to include("btrfs_default_subvolume" => "@") end context "when btrfs default subvolume name is set to false" do let(:profile) { { "btrfs_set_default_subvolume_name" => false } } it "disables the btrfs default subvolume" do - expect(Yast::ProductFeatures).to receive(:SetSection) - .with("partitioning", { "btrfs_default_subvolume" => "" }) subject.import_general_settings(profile) + expect(Yast::ProductFeatures.GetSection("partitioning")) + .to include("btrfs_default_subvolume" => "") end end @@ -219,8 +222,9 @@ let(:profile) { {} } it "uses the default for the product" do - expect(Yast::ProductFeatures).to receive(:SetSection).with("partitioning", {}) subject.import_general_settings(profile) + expect(Yast::ProductFeatures.GetSection("partitioning")) + .to include("btrfs_default_subvolume" => "@") end end @@ -228,8 +232,9 @@ let(:profile) { { "btrfs_set_default_subvolume_name" => true } } it "uses the default for the product" do - expect(Yast::ProductFeatures).to receive(:SetSection).with("partitioning", {}) subject.import_general_settings(profile) + expect(Yast::ProductFeatures.GetSection("partitioning")) + .to include("btrfs_default_subvolume" => "@") end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.45/test/lib/storage_proposal_test.rb new/autoyast2-4.0.49/test/lib/storage_proposal_test.rb --- old/autoyast2-4.0.45/test/lib/storage_proposal_test.rb 2018-04-03 17:46:54.000000000 +0200 +++ new/autoyast2-4.0.49/test/lib/storage_proposal_test.rb 2018-04-23 11:08:21.000000000 +0200 @@ -7,8 +7,13 @@ subject(:storage_proposal) { described_class.new(profile) } let(:storage_manager) { double(Y2Storage::StorageManager) } - let(:guided_proposal) { instance_double(Y2Storage::GuidedProposal, propose: nil, proposed?: true) } - let(:autoinst_proposal) { instance_double(Y2Storage::AutoinstProposal, propose: nil, proposed?: true) } + let(:devicegraph) { instance_double(Y2Storage::Devicegraph) } + let(:guided_proposal) do + instance_double(Y2Storage::GuidedProposal, propose: nil, proposed?: true, devices: devicegraph) + end + let(:autoinst_proposal) do + instance_double(Y2Storage::AutoinstProposal, propose: nil, proposed?: true, devices: devicegraph) + end let(:profile) { [{ "device" => "/dev/sda" }] } before do @@ -29,6 +34,7 @@ expect(Y2Storage::GuidedProposal).to receive(:initial) expect(storage_proposal.proposal).to be(guided_proposal) end + end context "when profile contains an empty set of partitions" do @@ -62,6 +68,20 @@ expect(issue).to_not be_nil end end + + context "when no proposal is possible" do + let(:devicegraph) { nil } + + before do + allow(guided_proposal).to receive(:devices).and_return(nil) + end + + it "registers an issue" do + issues_list = storage_proposal.issues_list + issue = issues_list.find { |i| i.is_a?(Y2Storage::AutoinstIssues::NoProposal) } + expect(issue).to_not be_nil + end + end end describe "#save" do

1 0