Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2016-08-31 00:02:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2016-08-18 10:18:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2016-08-31 00:02:31.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Aug 26 10:37:45 UTC 2016 - [email protected] + +- Packages: remove warning icon from package callbacks. + (bnc#988949) +- 3.1.205 + +------------------------------------------------------------------- +Thu Aug 25 14:17:13 CEST 2016 - [email protected] + +- Set AutoYaST default timeout entries for reporting errors + correctly and do not overwrite AutoYaST profile settings. + (bnc#988949) +- 3.1.204 + +------------------------------------------------------------------- Old: ---- yast2-3.1.203.tar.bz2 New: ---- yast2-3.1.205.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.cGt3yd/_old 2016-08-31 00:02:32.000000000 +0200 +++ /var/tmp/diff_new_pack.cGt3yd/_new 2016-08-31 00:02:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.203 +Version: 3.1.205 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 ++++++ yast2-3.1.203.tar.bz2 -> yast2-3.1.205.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/CONTRIBUTING.md new/yast2-3.1.205/CONTRIBUTING.md --- old/yast2-3.1.203/CONTRIBUTING.md 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/CONTRIBUTING.md 2016-08-26 14:04:10.000000000 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/src/modules/Report.rb new/yast2-3.1.205/library/general/src/modules/Report.rb --- old/yast2-3.1.203/library/general/src/modules/Report.rb 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/library/general/src/modules/Report.rb 2016-08-26 14:04:10.000000000 +0200 @@ -59,10 +59,12 @@ @display_yesno_messages = true # timeouts - @timeout_errors = 0 - @timeout_warnings = 0 - @timeout_messages = 0 - @timeout_yesno_messages = 0 + # AutoYaST has different timeout (bnc#887397) + @default_timeout = (Mode.auto || Mode.config) ? 10 : 0 + @timeout_errors = 0 # default: Errors stop the installation + @timeout_warnings = @default_timeout + @timeout_messages = @default_timeout + @timeout_yesno_messages = @default_timeout # logging flags @log_errors = true @@ -230,12 +232,14 @@ # timeouts @timeout_errors = Ops.get_integer(@error_settings, "timeout", 0) - @timeout_warnings = Ops.get_integer(@warning_settings, "timeout", 0) - @timeout_messages = Ops.get_integer(@message_settings, "timeout", 0) + @timeout_warnings = Ops.get_integer(@warning_settings, "timeout", + @default_timeout) + @timeout_messages = Ops.get_integer(@message_settings, "timeout", + @default_timeout) @timeout_yesno_messages = Ops.get_integer( @yesno_message_settings, "timeout", - 0 + @default_timeout ) # logging flags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/test/data/ay_installation.yml new/yast2-3.1.205/library/general/test/data/ay_installation.yml --- old/yast2-3.1.203/library/general/test/data/ay_installation.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.205/library/general/test/data/ay_installation.yml 2016-08-26 14:04:10.000000000 +0200 @@ -0,0 +1,17 @@ +--- +"errors": + log: true + show: true + timeout: 10 +"messages": + log: true + show: true + timeout: 10 +"warnings": + log: true + show: true + timeout: 20 +"yesno_messages": + log: true + show: true + timeout: 40 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/test/data/ay_profile.yml new/yast2-3.1.205/library/general/test/data/ay_profile.yml --- old/yast2-3.1.203/library/general/test/data/ay_profile.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.205/library/general/test/data/ay_profile.yml 2016-08-26 14:04:10.000000000 +0200 @@ -0,0 +1,13 @@ +--- +"errors": + log: true + show: true + timeout: 10 +"warnings": + log: true + show: true + timeout: 20 +"yesno_messages": + log: true + show: true + timeout: 40 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/test/data/default_ay_installation.yml new/yast2-3.1.205/library/general/test/data/default_ay_installation.yml --- old/yast2-3.1.203/library/general/test/data/default_ay_installation.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.205/library/general/test/data/default_ay_installation.yml 2016-08-26 14:04:10.000000000 +0200 @@ -0,0 +1,17 @@ +--- +"errors": + log: true + show: true + timeout: 0 +"messages": + log: true + show: true + timeout: 10 +"warnings": + log: true + show: true + timeout: 10 +"yesno_messages": + log: true + show: true + timeout: 10 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/test/data/default_normal_installation.yml new/yast2-3.1.205/library/general/test/data/default_normal_installation.yml --- old/yast2-3.1.203/library/general/test/data/default_normal_installation.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.205/library/general/test/data/default_normal_installation.yml 2016-08-26 14:04:10.000000000 +0200 @@ -0,0 +1,17 @@ +--- +"errors": + log: true + show: true + timeout: 0 +"messages": + log: true + show: true + timeout: 0 +"warnings": + log: true + show: true + timeout: 0 +"yesno_messages": + log: true + show: true + timeout: 0 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/general/test/report_test.rb new/yast2-3.1.205/library/general/test/report_test.rb --- old/yast2-3.1.203/library/general/test/report_test.rb 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/library/general/test/report_test.rb 2016-08-26 14:04:10.000000000 +0200 @@ -1,8 +1,10 @@ #! /usr/bin/env rspec require_relative "test_helper" +require "yaml" Yast.import "Report" +Yast.import "Mode" describe Yast::Report do before { subject.ClearAll } @@ -121,4 +123,52 @@ expect(subject.GetMessages(0, 1, 0, 0)).to match(/Message/) end end + + describe ".Settings" do + DATA_DIR = File.join(File.expand_path(File.dirname(__FILE__)), "data") + let(:ay_profile) { YAML.load_file(File.join(DATA_DIR, "ay_profile.yml")) } + let(:default_normal) { YAML.load_file(File.join(DATA_DIR, "default_normal_installation.yml")) } + let(:default_ay) { YAML.load_file(File.join(DATA_DIR, "default_ay_installation.yml")) } + let(:result_ay) { YAML.load_file(File.join(DATA_DIR, "ay_installation.yml")) } + + context "while normal installation" do + it "check default entries" do + allow(Yast::Mode).to receive(:mode).and_return("installation") + subject.main + expect(subject.Export()).to match(default_normal) + end + end + + context "while AutoYaST installation" do + before(:each) do + allow(Yast::Mode).to receive(:mode).and_return("autoinstallation") + subject.main + end + + it "sets default entries" do + expect(subject.Export()).to match(default_ay) + end + it "check if default entries are not overwritten by empty import" do + subject.Import({}) + expect(subject.Export()).to match(default_ay) + end + it "set flags via AutoYaST profile" do + subject.Import(ay_profile) + expect(subject.Export()).to match(result_ay) + end + end + + context "while AutoYaST cloning system" do + before(:each) do + allow(Yast::Mode).to receive(:mode).and_return("autoinst_config") + subject.main + end + + it "AutoYaST default entries will be cloned" do + # Set timeout for autoyast to 10 seconds (bnc#887397) + expect(subject.Export()).to match(default_ay) + end + end + end + end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/library/packages/src/modules/PackageCallbacks.rb new/yast2-3.1.205/library/packages/src/modules/PackageCallbacks.rb --- old/yast2-3.1.203/library/packages/src/modules/PackageCallbacks.rb 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/library/packages/src/modules/PackageCallbacks.rb 2016-08-26 14:04:10.000000000 +0200 @@ -2988,12 +2988,7 @@ VBox( HSpacing(50), # enforce width VSpacing(0.1), - HBox( - # maybe more icon types could be used - # "info, "warning", "error" - Icon.Image("warning", "margin_right" => 2), - Left(Label(message)) - ), + Left(Label(message)), VSpacing(0.1), HBox( HSpacing(0.6), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/package/yast2.changes new/yast2-3.1.205/package/yast2.changes --- old/yast2-3.1.203/package/yast2.changes 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/package/yast2.changes 2016-08-26 14:04:11.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Fri Aug 26 10:37:45 UTC 2016 - [email protected] + +- Packages: remove warning icon from package callbacks. + (bnc#988949) +- 3.1.205 + +------------------------------------------------------------------- +Thu Aug 25 14:17:13 CEST 2016 - [email protected] + +- Set AutoYaST default timeout entries for reporting errors + correctly and do not overwrite AutoYaST profile settings. + (bnc#988949) +- 3.1.204 + +------------------------------------------------------------------- Tue Aug 9 11:31:45 UTC 2016 - [email protected] - Popup.Error will escape the text when message is too long and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.203/package/yast2.spec new/yast2-3.1.205/package/yast2.spec --- old/yast2-3.1.203/package/yast2.spec 2016-08-09 15:21:42.000000000 +0200 +++ new/yast2-3.1.205/package/yast2.spec 2016-08-26 14:04:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.203 +Version: 3.1.205 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0
