Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2020-07-30 10:00:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Thu Jul 30 10:00:26 2020 rev:491 rq:823387 version:4.3.19 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2020-07-27 17:36:09.590754739 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new.3592/yast2.changes 2020-07-30 10:00:47.771246140 +0200 @@ -1,0 +2,13 @@ +Tue Jul 28 14:27:40 UTC 2020 - Imobach Gonzalez Sosa <[email protected]> + +- XML: do not export the system ID if it is not defined + (boo#1174424). +- 4.3.19 + +------------------------------------------------------------------- +Tue Jul 28 09:07:05 UTC 2020 - Josef Reidinger <[email protected]> + +- Handle exceptions when parsing xml file (related to bsc#1170886) +- 4.3.18 + +------------------------------------------------------------------- Old: ---- yast2-4.3.17.tar.bz2 New: ---- yast2-4.3.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.MEPMdi/_old 2020-07-30 10:00:49.079246921 +0200 +++ /var/tmp/diff_new_pack.MEPMdi/_new 2020-07-30 10:00:49.083246924 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.3.17 +Version: 4.3.19 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only ++++++ yast2-4.3.17.tar.bz2 -> yast2-4.3.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.17/library/commandline/src/modules/CommandLine.rb new/yast2-4.3.19/library/commandline/src/modules/CommandLine.rb --- old/yast2-4.3.17/library/commandline/src/modules/CommandLine.rb 2020-07-24 10:58:12.000000000 +0200 +++ new/yast2-4.3.19/library/commandline/src/modules/CommandLine.rb 2020-07-29 14:07:59.000000000 +0200 @@ -1021,7 +1021,17 @@ Ops.set(exportmap, "commands", commands) Ops.set(exportmap, "module", Ops.get_string(@cmdlinespec, "id", "")) - XML.YCPToXMLFile(:xmlhelp, exportmap, xmlfilename) + begin + XML.YCPToXMLFile(:xmlhelp, exportmap, xmlfilename) + rescue XMLSerializationError => e + # error message - creation of xml failed + Print( + _("Failed to create XML file.") + ) + Builtins.y2error("Failed to serialize xml help: #{e.inspect}") + return false + end + Builtins.y2milestone("exported XML map: %1", exportmap) return true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.17/library/control/src/modules/ProductControl.rb new/yast2-4.3.19/library/control/src/modules/ProductControl.rb --- old/yast2-4.3.17/library/control/src/modules/ProductControl.rb 2020-07-24 10:58:12.000000000 +0200 +++ new/yast2-4.3.19/library/control/src/modules/ProductControl.rb 2020-07-29 14:07:59.000000000 +0200 @@ -288,9 +288,12 @@ # @param string control file # @return [Boolean] def ReadControlFile(controlfile) - @productControl = XML.XMLToYCPFile(controlfile) - - return false if @productControl.nil? + begin + @productControl = XML.XMLToYCPFile(controlfile) + rescue RuntimeError => e + log.error "Failed to read control file: #{e.inspect}" + return false + end # log the read control.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.17/library/control/src/modules/WorkflowManager.rb new/yast2-4.3.19/library/control/src/modules/WorkflowManager.rb --- old/yast2-4.3.17/library/control/src/modules/WorkflowManager.rb 2020-07-24 10:58:12.000000000 +0200 +++ new/yast2-4.3.19/library/control/src/modules/WorkflowManager.rb 2020-07-29 14:07:59.000000000 +0200 @@ -1231,9 +1231,10 @@ end def IncorporateControlFileOptions(filename) - update_file = XML.XMLToYCPFile(filename) - if update_file.nil? - Builtins.y2error("Unable to read the %1 control file", filename) + begin + update_file = XML.XMLToYCPFile(filename) + rescue RuntimeError => e + log.error "Unable to read the #{filename} control file: #{e.inspect}" return false end @@ -1345,7 +1346,13 @@ def IntegrateWorkflow(filename) Builtins.y2milestone("IntegrateWorkflow %1", filename) - update_file = XML.XMLToYCPFile(filename) + begin + update_file = XML.XMLToYCPFile(filename) + rescue RuntimeError => e + log.error "Failed to parse #{update_file}: #{e.inspect}" + return false + end + name = Ops.get_string(update_file, "display_name", "") if !UpdateInstallation( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.17/library/control/test/workflow_manager_test.rb new/yast2-4.3.19/library/control/test/workflow_manager_test.rb --- old/yast2-4.3.17/library/control/test/workflow_manager_test.rb 2020-07-24 10:58:12.000000000 +0200 +++ new/yast2-4.3.19/library/control/test/workflow_manager_test.rb 2020-07-29 14:07:59.000000000 +0200 @@ -166,6 +166,17 @@ expect(subject.IntegrateWorkflow(filename)).to eq(false) end end + + context "when fails to parse file" do + before do + allow(Yast::XML).to receive(:XMLToYCPFile).and_raise(Yast::XMLDeserializationError) + end + + it "returns false" do + expect(subject.IntegrateWorkflow(filename)).to eq(false) + end + end + end describe "#UpdateInstallation" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.17/library/general/doc/Hooks.md new/yast2-4.3.19/library/general/doc/Hooks.md --- old/yast2-4.3.17/library/general/doc/Hooks.md 2020-07-24 10:58:12.000000000 +0200 +++ new/yast2-4.3.19/library/general/doc/Hooks.md 2020-07-29 14:07:59.000000000 +0200 @@ -237,7 +237,6 @@ * autoinit * autosetup * initial_autoinstallation_proposal -* autoimage Those entries might vary due to different entries in you xml profile which drives the autoinstallation workflow. The rest of the checkpoints listed above should not much differ. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.17/library/xml/src/modules/XML.rb new/yast2-4.3.19/library/xml/src/modules/XML.rb --- old/yast2-4.3.17/library/xml/src/modules/XML.rb 2020-07-24 10:58:12.000000000 +0200 +++ new/yast2-4.3.19/library/xml/src/modules/XML.rb 2020-07-29 14:07:59.000000000 +0200 @@ -60,7 +60,7 @@ @listEntries = {} # The system ID, or the DTD URI - @systemID = "" + @systemID = nil # root element of the XML file @rootElement = "" @@ -87,7 +87,7 @@ "cdataSections", @cdataSections ), - "systemID" => Ops.get_string(doc_settings, "systemID", @systemID), + "systemID" => doc_settings["systemID"], "rootElement" => Ops.get_string( doc_settings, "rootElement", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.17/package/yast2.changes new/yast2-4.3.19/package/yast2.changes --- old/yast2-4.3.17/package/yast2.changes 2020-07-24 10:58:12.000000000 +0200 +++ new/yast2-4.3.19/package/yast2.changes 2020-07-29 14:07:59.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Jul 28 14:27:40 UTC 2020 - Imobach Gonzalez Sosa <[email protected]> + +- XML: do not export the system ID if it is not defined + (boo#1174424). +- 4.3.19 + +------------------------------------------------------------------- +Tue Jul 28 09:07:05 UTC 2020 - Josef Reidinger <[email protected]> + +- Handle exceptions when parsing xml file (related to bsc#1170886) +- 4.3.18 + +------------------------------------------------------------------- Fri Jul 24 08:53:31 UTC 2020 - Knut Anderssen <[email protected]> - Provide a way to determine which resources (zones, services...) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.17/package/yast2.spec new/yast2-4.3.19/package/yast2.spec --- old/yast2-4.3.17/package/yast2.spec 2020-07-24 10:58:12.000000000 +0200 +++ new/yast2-4.3.19/package/yast2.spec 2020-07-29 14:07:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.3.17 +Version: 4.3.19 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only
