Imported Upstream version 14.38.4

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 46c9884ab36b0e36d50805afca063f3f5e3da532..0b5785d591961df610cc6da17415ddb5931a8792 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "30")
 SET(LIBZYPP_MINOR "38")
-SET(LIBZYPP_PATCH "3")
+SET(LIBZYPP_PATCH "4")
 #
-# LAST RELEASED: 14.38.3 (30)
+# LAST RELEASED: 14.38.4 (30)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index db69894f2430b37aae41da224a61a754dc982597..97a043deed217c08f9e07e744130ee30f9ada0e2 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May  6 14:26:54 CEST 2015 - ma@suse.de
+
+- Fix repo alias containing ']' not handled correctly (bnc#929528)
+- version 14.38.4 (30)
+
 -------------------------------------------------------------------
 Tue May  5 14:33:23 CEST 2015 - ma@suse.de
 

diff --git a/tests/parser/inifile/data/2.ini b/tests/parser/inifile/data/2.ini
index 049247a6a68113dcbcff1108575a13ab2ffe3df3..36d21c8409662d61a6218d4ecbc382eeafd8762a 100644 (file)
--- a/tests/parser/inifile/data/2.ini
+++ b/tests/parser/inifile/data/2.ini
@@ -8,3 +8,5 @@ name1==foo
 name1= =foo
 name2=f=oo
 name3=foo=
+[te]st]
+name=foo

diff --git a/tests/parser/inifile/iniparser_test.cc b/tests/parser/inifile/iniparser_test.cc
index 8857bd381d0c5c40d1346e78c82080050284c781..fb43929a9682fea3cbfec10da2adbb49397ab5d1 100644 (file)
--- a/tests/parser/inifile/iniparser_test.cc
+++ b/tests/parser/inifile/iniparser_test.cc
@@ -41,7 +41,7 @@ class WithSpacesTest : public IniParser
   virtual void consume( const std::string &section )
   {
     MIL << section << endl;
-    BOOST_CHECK(section == "base" || section == "equal");
+    BOOST_CHECK(section == "base" || section == "equal" || section == "te]st");
   }
 
   virtual void consume( const std::string &section, const std::string &key, const std::string &value )

diff --git a/zypp/parser/IniParser.cc b/zypp/parser/IniParser.cc
index cdead1eab48a494b1d881799ce8f0b44b5e4a97f..9958f66b78531ace8ac90ab49f7498abe0ee1b50 100644 (file)
--- a/zypp/parser/IniParser.cc
+++ b/zypp/parser/IniParser.cc
@@ -99,7 +99,7 @@ void IniParser::parse( const InputStream & input_r, const ProgressData::Receiver
 
     if (trimmed[0] == '[')
     {
-      std::string::size_type pos = trimmed.find(']');
+      std::string::size_type pos = trimmed.rfind(']');
       if ( pos != std::string::npos )
       {
        std::string section = trimmed.substr(1, pos-1);