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

Imported Upstream version 14.43.3

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 179f5c2..8d472c3 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "39")
 SET(LIBZYPP_MINOR "43")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_PATCH "3")
 #
-# LAST RELEASED: 14.43.2 (39)
+# LAST RELEASED: 14.43.3 (39)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======
diff --git a/package/libzypp.changes b/package/libzypp.changes
index 1bf5bee..62ac130 100644
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Sep 15 15:29:40 CEST 2016 - ma@suse.de
+
+- RepoFileReader: fix parsing of multiline url entries (bsc#964932)
+- version 14.43.3 (39)
+
+-------------------------------------------------------------------
 Wed Aug 10 12:20:40 CEST 2016 - ma@suse.de
 
 - Report numeric curl error if code is unrecognized (bsc#992302)
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