From: DongHun Kwak <dh0128.kwak@samsung.com>
Date: Tue, 1 Nov 2016 02:15:50 +0000 (+0900)
Subject: Imported Upstream version 16.2.4
X-Git-Tag: upstream/16.3.1~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9a33602ac60fd5dcc940aaa102affba0a8ed6a0;p=platform%2Fupstream%2Flibzypp.git

Imported Upstream version 16.2.4

Change-Id: If6ce4f62c2eb507f6b0d7c8f7ecbc68dfba3f20f
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
---

diff --git a/VERSION.cmake b/VERSION.cmake
index 1031ec1..4989410 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "16")
 SET(LIBZYPP_COMPATMINOR "0")
 SET(LIBZYPP_MINOR "2")
-SET(LIBZYPP_PATCH "3")
+SET(LIBZYPP_PATCH "4")
 #
-# LAST RELEASED: 16.2.3 (0)
+# LAST RELEASED: 16.2.4 (0)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======
diff --git a/package/libzypp.changes b/package/libzypp.changes
index ceff22b..8909cff 100644
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,8 +1,17 @@
 -------------------------------------------------------------------
+Thu Sep 15 15:27:15 CEST 2016 - ma@suse.de
+
+- RepoFileReader: fix parsing of multiline url entries (bsc#964932)
+- Allow repo type 'rpm' as alias for 'rpm-md' (fixes openSUSE/zypper#100)
+- version 16.2.4 (0)
+
+-------------------------------------------------------------------
 Fri Sep  9 16:43:30 CEST 2016 - ma@suse.de
 
 - xmlout::Node:  Allow adding nore attributes while the start node
   is not closed (FATE#320699)
+- Fixes broken XML output introduced by an unwanted change in 16.2.2
+  (bsc#998344)
 - version 16.2.3 (0)
 
 -------------------------------------------------------------------
diff --git a/tests/parser/RepoFileReader_test.cc b/tests/parser/RepoFileReader_test.cc
index 7f14cc0..feed8df 100644
--- a/tests/parser/RepoFileReader_test.cc
+++ b/tests/parser/RepoFileReader_test.cc
@@ -14,6 +14,9 @@ static string suse_repo = "[factory-oss]\n"
 "enabled=1\n"
 "autorefresh=0\n"
 "baseurl=http://download.opensuse.org/factory-tested/repo/oss/\n"
+"baseurl=http://download.opensuse.org/factory-tested/repo/oss/2\n"
+"plugin:spacewalk?channel=sle-manager-tools12-pool-x86_64-sp1&server=0\n"
+"http://download.opensuse.org/factory-tested/repo/=oss/4\n"
 "type=yast2\n"
 "keeppackages=0\n";
 
@@ -46,6 +49,10 @@ BOOST_AUTO_TEST_CASE(read_repo_file)
     RepoCollector collector;
     parser::RepoFileReader parser( input, bind( &RepoCollector::collect, &collector, _1 ) );
     BOOST_CHECK_EQUAL(1, collector.repos.size());
+
+    const RepoInfo & repo( collector.repos.front() );
+    BOOST_CHECK_EQUAL( 4, repo.baseUrlsSize() );
+    cout << repo << endl;
   }
   // fedora
   {
diff --git a/zypp/parser/IniParser.cc b/zypp/parser/IniParser.cc
index 9958f66..c74386b 100644
--- a/zypp/parser/IniParser.cc
+++ b/zypp/parser/IniParser.cc
@@ -33,7 +33,7 @@ namespace parser
   namespace {
     inline const std::string & keyGarbage()
     {
-      static const std::string & _val( ",|/\\" );
+      static const std::string & _val( ":/?|,\\" );
       return _val;
     }
   } //namespace
diff --git a/zypp/repo/RepoType.cc b/zypp/repo/RepoType.cc
index 390e406..644f913 100644
--- a/zypp/repo/RepoType.cc
+++ b/zypp/repo/RepoType.cc
@@ -24,7 +24,7 @@ namespace repo
       static NamedValue<RepoType::Type> & _t( *new NamedValue<RepoType::Type> );
       if ( _t.empty() )
       {
-	_t( RepoType::RPMMD_e )		| "rpm-md"	| "rpmmd"|"repomd"|"yum"|"up2date";
+	_t( RepoType::RPMMD_e )		| "rpm-md"	| "rpm"|"rpmmd"|"repomd"|"yum"|"up2date";
 	_t( RepoType::YAST2_e )		| "yast2"	| "yast"|"susetags";
 	_t( RepoType::RPMPLAINDIR_e )	| "plaindir";
 	_t( RepoType::NONE_e )		| "NONE"	| "none";