Merge 786f2e1 into 140de8a

yast · Jul 28, 2020 · b733e2a · b733e2a
2 parents 140de8a + 786f2e1
commit b733e2a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/library/xml/src/modules/XML.rb b/library/xml/src/modules/XML.rb
@@ -60,7 +60,7 @@ def main
       @listEntries = {}
 
       # The system ID, or the DTD URI
-      @systemID = ""
+      @systemID = nil
 
       # root element of the XML file
       @rootElement = ""
@@ -87,7 +87,7 @@ def xmlCreateDoc(doc, doc_settings)
           "cdataSections",
           @cdataSections
         ),
-        "systemID"      => Ops.get_string(doc_settings, "systemID", @systemID),
+        "systemID"      => doc_settings["systemID"],
         "rootElement"   => Ops.get_string(
           doc_settings,
           "rootElement",

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul 28 14:27:40 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- 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 <jreidinger@suse.com>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.3.18
+Version:        4.3.19
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only