Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2019-02-04 16:09:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2" Mon Feb 4 16:09:20 2019 rev:253 rq:670177 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2018-12-31 09:42:01.502431019 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new.28833/autoyast2.changes 2019-02-04 16:09:22.202012024 +0100 @@ -1,0 +2,6 @@ +Wed Jan 30 15:14:25 CET 2019 - [email protected] + +- Fixed conflicting items in rule dialogs (bsc#1123091). +- 4.1.0 + +------------------------------------------------------------------- Old: ---- autoyast2-4.0.70.tar.bz2 New: ---- autoyast2-4.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.os0J7q/_old 2019-02-04 16:09:22.990011531 +0100 +++ /var/tmp/diff_new_pack.os0J7q/_new 2019-02-04 16:09:22.990011531 +0100 @@ -1,7 +1,7 @@ # # spec file for package autoyast2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.0.70 +Version: 4.1.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-4.0.70.tar.bz2 -> autoyast2-4.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.70/package/autoyast2.changes new/autoyast2-4.1.0/package/autoyast2.changes --- old/autoyast2-4.0.70/package/autoyast2.changes 2018-12-03 16:46:13.000000000 +0100 +++ new/autoyast2-4.1.0/package/autoyast2.changes 2019-01-30 17:32:48.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 30 15:14:25 CET 2019 - [email protected] + +- Fixed conflicting items in rule dialogs (bsc#1123091). +- 4.1.0 + +------------------------------------------------------------------- Sat Nov 24 00:10:55 UTC 2018 - Stasiek Michalski <[email protected]> - Provide icon with module (boo#1109310) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.70/package/autoyast2.spec new/autoyast2-4.1.0/package/autoyast2.spec --- old/autoyast2-4.0.70/package/autoyast2.spec 2018-12-03 16:46:13.000000000 +0100 +++ new/autoyast2-4.1.0/package/autoyast2.spec 2019-01-30 17:32:48.000000000 +0100 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.0.70 +Version: 4.1.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.70/src/modules/AutoInstallRules.rb new/autoyast2-4.1.0/src/modules/AutoInstallRules.rb --- old/autoyast2-4.0.70/src/modules/AutoInstallRules.rb 2018-12-03 16:46:13.000000000 +0100 +++ new/autoyast2-4.1.0/src/modules/AutoInstallRules.rb 2019-01-30 17:32:48.000000000 +0100 @@ -680,11 +680,7 @@ element_nr = Ops.add(element_nr, 1) if Builtins.contains(@tomerge, file) Builtins.foreach(Ops.get_list(rule, ["dialog", "conflicts"], [])) do |c| - Ops.set( - conflictsCounter, - c, - Ops.add(Ops.get(conflictsCounter, c, 0), 1) - ) + conflictsCounter[c] = 0 end end end @@ -733,18 +729,14 @@ ) ) UI.ChangeWidget(Id(:back), :Enabled, false) if dialogIndex == 0 - Builtins.foreach(conflictsCounter) do |c, n| - UI.ChangeWidget( - Id(c), - :Enabled, - Ops.greater_than(n, 0) ? false : true - ) - UI.ChangeWidget( - Id(c), - :Value, - Ops.greater_than(n, 0) ? false : true - ) + + # If there are conflicting items set them all to enabled/not_selected + # in order to let the user decide at first. + conflictsCounter.each do |c, n| + UI.ChangeWidget(Id(c), :Enabled, true) + UI.ChangeWidget(Id(c), :Value, false) end + while true ret = nil if timeout == 0
