Imported Upstream version 16.4.2

diff --git a/VERSION.cmake b/VERSION.cmake
index 04dabd5..19b1ab8 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "16")
 SET(LIBZYPP_COMPATMINOR "0")
 SET(LIBZYPP_MINOR "4")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_PATCH "2")
 #
-# LAST RELEASED: 16.4.1 (0)
+# LAST RELEASED: 16.4.2 (0)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index bac99fa..c2f66e0 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Feb 14 12:07:14 CET 2017 - ma@suse.de
+
+- dumpAsXmlOnL: xml escape node content (bsc#1024909)
+- version 16.4.2 (0)
+
+-------------------------------------------------------------------
 Fri Feb  3 13:40:04 CET 2017 - ma@suse.de
 
 - MediaMultiCurl: Trigger aliveCallback when downloading metalink

diff --git a/po/ja.po b/po/ja.po
index 560f5cd..378ceb6 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: zypp\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-11-21 15:07+0100\n"
-"PO-Revision-Date: 2016-12-07 22:36+0000\n"
+"PO-Revision-Date: 2017-02-08 22:38+0000\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese "
 "<https://l10n.opensuse.org/projects/libzypp/master/ja/>\n"
@@ -4260,7 +4260,7 @@ msgstr "サービスプラグインは属性の変更をサポートしていま
 msgid ""
 "Package %s seems to be corrupted during transfer. Do you want to retry "
 "retrieval?"
-msgstr "パッケージ %s は転送中に破れてしまったようです。もう一度取得しますか?"
+msgstr "パッケージ %s は転送中に壊れてしまったようです。もう一度取得しますか？"
 
 #: zypp/repo/PackageProvider.cc:216
 msgid "Signature verification failed"

diff --git a/zypp/base/Xml.h b/zypp/base/Xml.h
index 533c229..83bb693 100644 (file)
--- a/zypp/base/Xml.h
+++ b/zypp/base/Xml.h
@@ -214,7 +214,7 @@ namespace zypp
   {
     xmlout::Node guard( str, name_r, xmlout::Node::optionalContent );
     const std::string & content( asString( obj ) );
-    if ( ! content.empty() ) *guard << content;
+    if ( ! content.empty() ) *guard << xml::escape( content );
     return str;
   }
   //@}