Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory checked
in at 2022-02-17 23:40:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2 (Old)
and /work/SRC/openSUSE:Factory/.yast2.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2"
Thu Feb 17 23:40:02 2022 rev:528 rq:955663 version:4.4.45
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2022-02-01
14:02:42.236176834 +0100
+++ /work/SRC/openSUSE:Factory/.yast2.new.1958/yast2.changes 2022-02-17
23:40:58.175700695 +0100
@@ -1,0 +2,14 @@
+Thu Feb 17 13:25:33 UTC 2022 - Steffen Winterfeldt <snw...@suse.com>
+
+- do not strip surrounding white space in CDATA XML elements (bsc#1195910)
+- 4.4.45
+
+-------------------------------------------------------------------
+Wed Feb 16 15:17:14 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Keep the user defined $Y2STYLE and $XCURSOR_THEME environment
+ variables, allow changing the installer theme via these
+ environment variables (related to jsc#SLE-20547)
+- 4.4.44
+
+-------------------------------------------------------------------
Old:
----
yast2-4.4.43.tar.bz2
New:
----
yast2-4.4.45.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.jXSaBF/_old 2022-02-17 23:40:58.839700689 +0100
+++ /var/tmp/diff_new_pack.jXSaBF/_new 2022-02-17 23:40:58.843700689 +0100
@@ -17,7 +17,7 @@
Name: yast2
-Version: 4.4.43
+Version: 4.4.45
Release: 0
Summary: YaST2 Main Package
++++++ yast2-4.4.43.tar.bz2 -> yast2-4.4.45.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.4.43/library/xml/src/modules/XML.rb
new/yast2-4.4.45/library/xml/src/modules/XML.rb
--- old/yast2-4.4.43/library/xml/src/modules/XML.rb 2022-01-28
16:18:39.000000000 +0100
+++ new/yast2-4.4.45/library/xml/src/modules/XML.rb 2022-02-17
16:28:49.000000000 +0100
@@ -247,7 +247,13 @@
children = children.select(&:element?)
# we need just direct text under node. Can be splitted with another
elements
# but remove whitespace only text
- text = node.xpath("text()").text.strip
+ #
+ # Do NOT strip surrounding white space in CDATA blocks (bsc#1195910).
+ # This restores the behavior prior to SLE15-SP3.
+ #
+ # See also #add_element.
+ text_nodes = node.xpath("text()")
+ text = text_nodes.map { |n| n.cdata? ? n.content : n.content.strip }.join
type = fetch_type(text, children, node)
@@ -301,7 +307,13 @@
element = Nokogiri::XML::Node.new(key, doc)
case value
when ::String
- element.content = value
+ # Write CDATA block if string has surrounding white space. This
matches
+ # the stripping in #parse_node.
+ if value.match?(/\A\s|\s\z/)
+ element.add_child(doc.create_cdata(value))
+ else
+ element.content = value
+ end
when ::Integer
element[type_attr] = "integer"
element.content = value.to_s
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.4.43/library/xml/test/xml_test.rb
new/yast2-4.4.45/library/xml/test/xml_test.rb
--- old/yast2-4.4.43/library/xml/test/xml_test.rb 2022-01-28
16:18:39.000000000 +0100
+++ new/yast2-4.4.45/library/xml/test/xml_test.rb 2022-02-17
16:28:49.000000000 +0100
@@ -85,6 +85,30 @@
expect(subject.YCPToXMLString("test", input)).to eq expected
end
+
+ it "creates CDATA element if string starts with spaces" do
+ input = { "test" => " test", "lest" => "\nlest" }
+ expected = "<?xml version=\"1.0\"?>\n" \
+ "<!DOCTYPE test SYSTEM \"just_testing.dtd\">\n" \
+ "<test>\n" \
+ " <lest><![CDATA[\nlest]]></lest>\n" \
+ " <test><![CDATA[ test]]></test>\n" \
+ "</test>\n"
+
+ expect(subject.YCPToXMLString("test", input)).to eq expected
+ end
+
+ it "creates CDATA element if string ends with spaces" do
+ input = { "test" => "test ", "lest" => "lest\n" }
+ expected = "<?xml version=\"1.0\"?>\n" \
+ "<!DOCTYPE test SYSTEM \"just_testing.dtd\">\n" \
+ "<test>\n" \
+ " <lest><![CDATA[lest\n]]></lest>\n" \
+ " <test><![CDATA[test ]]></test>\n" \
+ "</test>\n"
+
+ expect(subject.YCPToXMLString("test", input)).to eq expected
+ end
end
context "for hash" do
@@ -283,6 +307,52 @@
expect(subject.XMLToYCPString(input)).to eq expected
end
+
+ it "strips spaces at the end of strings" do
+ input = "<?xml version=\"1.0\"?>\n" \
+ "<test xmlns=\"http://www.suse.com/1.0/yast2ns\";
xmlns:config=\"http://www.suse.com/1.0/configns\";>\n" \
+ " <test>foo </test>\n" \
+ " <lest>bar\n" \
+ " </lest>\n" \
+ "</test>\n"
+ expected = { "test" => "foo", "lest" => "bar" }
+
+ expect(subject.XMLToYCPString(input)).to eq expected
+ end
+
+ it "preserves spaces at the end of CDATA elements" do
+ input = "<?xml version=\"1.0\"?>\n" \
+ "<test xmlns=\"http://www.suse.com/1.0/yast2ns\";
xmlns:config=\"http://www.suse.com/1.0/configns\";>\n" \
+ " <test><![CDATA[foo ]]></test>\n" \
+ " <lest><![CDATA[bar\n]]></lest>\n" \
+ "</test>\n"
+ expected = { "test" => "foo ", "lest" => "bar\n" }
+
+ expect(subject.XMLToYCPString(input)).to eq expected
+ end
+
+ it "strips spaces at the start of strings" do
+ input = "<?xml version=\"1.0\"?>\n" \
+ "<test xmlns=\"http://www.suse.com/1.0/yast2ns\";
xmlns:config=\"http://www.suse.com/1.0/configns\";>\n" \
+ " <test> foo</test>\n" \
+ " <lest>\nbar" \
+ " </lest>\n" \
+ "</test>\n"
+ expected = { "test" => "foo", "lest" => "bar" }
+
+ expect(subject.XMLToYCPString(input)).to eq expected
+ end
+
+ it "preserves spaces at the start of CDATA elements" do
+ input = "<?xml version=\"1.0\"?>\n" \
+ "<test xmlns=\"http://www.suse.com/1.0/yast2ns\";
xmlns:config=\"http://www.suse.com/1.0/configns\";>\n" \
+ " <test><![CDATA[ foo]]></test>\n" \
+ " <lest><![CDATA[\nbar]]></lest>\n" \
+ "</test>\n"
+ expected = { "test" => " foo", "lest" => "\nbar" }
+
+ expect(subject.XMLToYCPString(input)).to eq expected
+ end
it "returns integer for xml element with type=\"integer\"" do
input = "<?xml version=\"1.0\"?>\n" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.4.43/package/yast2.changes
new/yast2-4.4.45/package/yast2.changes
--- old/yast2-4.4.43/package/yast2.changes 2022-01-28 16:18:39.000000000
+0100
+++ new/yast2-4.4.45/package/yast2.changes 2022-02-17 16:28:49.000000000
+0100
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Thu Feb 17 13:25:33 UTC 2022 - Steffen Winterfeldt <snw...@suse.com>
+
+- do not strip surrounding white space in CDATA XML elements (bsc#1195910)
+- 4.4.45
+
+-------------------------------------------------------------------
+Wed Feb 16 15:17:14 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Keep the user defined $Y2STYLE and $XCURSOR_THEME environment
+ variables, allow changing the installer theme via these
+ environment variables (related to jsc#SLE-20547)
+- 4.4.44
+
+-------------------------------------------------------------------
Fri Jan 28 14:03:04 UTC 2022 - Josef Reidinger <jreidin...@suse.com>
- ProductFeatures: add boot timeout option (jsc#SLE-22667)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.4.43/package/yast2.spec
new/yast2-4.4.45/package/yast2.spec
--- old/yast2-4.4.43/package/yast2.spec 2022-01-28 16:18:39.000000000 +0100
+++ new/yast2-4.4.45/package/yast2.spec 2022-02-17 16:28:49.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2
-Version: 4.4.43
+Version: 4.4.45
Release: 0
Summary: YaST2 Main Package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-4.4.43/scripts/yast2-funcs
new/yast2-4.4.45/scripts/yast2-funcs
--- old/yast2-4.4.43/scripts/yast2-funcs 2022-01-28 16:18:39.000000000
+0100
+++ new/yast2-4.4.45/scripts/yast2-funcs 2022-02-17 16:28:49.000000000
+0100
@@ -129,8 +129,12 @@
function set_inst_qt_env()
{
- export XCURSOR_THEME="DMZ-White"
- export Y2STYLE="installation.qss"
+ # default values
+ : "${Y2STYLE=installation.qss}"
+ : "${XCURSOR_THEME=DMZ-White}"
+
+ export XCURSOR_THEME
+ export Y2STYLE
export QT_HOME_DIR="/tmp/.qt/"
if [ "$Screenmode" != "" ] && [ "$Screenmode" != "default" ]; then
export Y2ALTSTYLE="$Screenmode"
