Hello community,
here is the log from the commit of package yast2-configuration-management for
openSUSE:Factory checked in at 2020-07-27 17:36:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-configuration-management (Old)
and /work/SRC/openSUSE:Factory/.yast2-configuration-management.new.3592
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-configuration-management"
Mon Jul 27 17:36:11 2020 rev:17 rq:822589 version:4.3.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-configuration-management/yast2-configuration-management.changes
2020-06-10 00:36:13.533045662 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-configuration-management.new.3592/yast2-configuration-management.changes
2020-07-27 17:36:20.926765771 +0200
@@ -1,0 +2,6 @@
+Fri Jul 24 08:44:41 UTC 2020 - Josef Reidinger <jreidin...@suse.com>
+
+- Handle exceptions when parsing xml file (related to bsc#1170886)
+- 4.3.2
+
+-------------------------------------------------------------------
Old:
----
yast2-configuration-management-4.3.1.tar.bz2
New:
----
yast2-configuration-management-4.3.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-configuration-management.spec ++++++
--- /var/tmp/diff_new_pack.nrHczA/_old 2020-07-27 17:36:21.838766658 +0200
+++ /var/tmp/diff_new_pack.nrHczA/_new 2020-07-27 17:36:21.842766662 +0200
@@ -17,7 +17,7 @@
Name: yast2-configuration-management
-Version: 4.3.1
+Version: 4.3.2
Release: 0
Url: https://github.com/yast/yast-migration
Summary: YaST2 - YaST Configuration Management
++++++ yast2-configuration-management-4.3.1.tar.bz2 ->
yast2-configuration-management-4.3.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-configuration-management-4.3.1/package/yast2-configuration-management.changes
new/yast2-configuration-management-4.3.2/package/yast2-configuration-management.changes
---
old/yast2-configuration-management-4.3.1/package/yast2-configuration-management.changes
2020-05-25 23:39:20.000000000 +0200
+++
new/yast2-configuration-management-4.3.2/package/yast2-configuration-management.changes
2020-07-24 11:06:26.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Jul 24 08:44:41 UTC 2020 - Josef Reidinger <jreidin...@suse.com>
+
+- Handle exceptions when parsing xml file (related to bsc#1170886)
+- 4.3.2
+
+-------------------------------------------------------------------
Thu May 21 21:20:44 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
- bsc#1169410:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-configuration-management-4.3.1/package/yast2-configuration-management.spec
new/yast2-configuration-management-4.3.2/package/yast2-configuration-management.spec
---
old/yast2-configuration-management-4.3.1/package/yast2-configuration-management.spec
2020-05-25 23:39:20.000000000 +0200
+++
new/yast2-configuration-management-4.3.2/package/yast2-configuration-management.spec
2020-07-24 11:06:26.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-configuration-management
-Version: 4.3.1
+Version: 4.3.2
Release: 0
Url: https://github.com/yast/yast-migration
Summary: YaST2 - YaST Configuration Management
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-configuration-management-4.3.1/src/lib/y2configuration_management/clients/main.rb
new/yast2-configuration-management-4.3.2/src/lib/y2configuration_management/clients/main.rb
---
old/yast2-configuration-management-4.3.1/src/lib/y2configuration_management/clients/main.rb
2020-05-25 23:39:20.000000000 +0200
+++
new/yast2-configuration-management-4.3.2/src/lib/y2configuration_management/clients/main.rb
2020-07-24 11:06:26.000000000 +0200
@@ -22,6 +22,7 @@
require "y2configuration_management/configurators/salt"
require "y2configuration_management/configurations/salt"
require "y2configuration_management/salt/formula"
+require "yast2/popup"
Yast.import "WFM"
Yast.import "PackageSystem"
@@ -49,6 +50,7 @@
# </configuration_management>
class Main < Yast::Client
include Yast::Logger
+ include Yast::I18n
# @see
https://documentation.suse.com/external-tree/en-us/suma/3.2/susemanager-best-practices/single-html/book.suma.best.practices/book.suma.best.practices.html#best.practice.salt.formulas.what
SUMA_FORMULAS_BASE = "/usr/share/susemanager/formulas".freeze
@@ -89,6 +91,11 @@
return :abort
end
Y2ConfigurationManagement::Clients::Provision.new.run
+ rescue Yast::XMLDeserializationError => e
+ textdomain "configuration_management"
+ Yast2::Popup.show(_("Failed to parse configuration file."),
+ headline: :error, details: e.message)
+ return :abort
end
private
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-configuration-management-4.3.1/test/y2configuration_management/clients/main_test.rb
new/yast2-configuration-management-4.3.2/test/y2configuration_management/clients/main_test.rb
---
old/yast2-configuration-management-4.3.1/test/y2configuration_management/clients/main_test.rb
2020-05-25 23:39:20.000000000 +0200
+++
new/yast2-configuration-management-4.3.2/test/y2configuration_management/clients/main_test.rb
2020-07-24 11:06:26.000000000 +0200
@@ -88,6 +88,23 @@
end
end
+ context "when configuration is not valid XML" do
+ before do
+ allow(Yast::XML).to
receive(:XMLToYCPFile).and_raise(Yast::XMLDeserializationError)
+ allow(Yast2::Popup).to receive(:show)
+ end
+
+ it "shows error popup" do
+ expect(Yast2::Popup).to receive(:show)
+
+ main.run
+ end
+
+ it "returns :abort" do
+ expect(main.run).to eq :abort
+ end
+ end
+
it "configures the provisioner" do
expect(configurator).to receive(:prepare).with(require_formulas: true)
main.run
