From 22425f6d16cbe2a67a538479876bf4c97bf36fc4 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Nov 2016 10:33:27 +0900 Subject: [PATCH] Imported Upstream version 14.38.4 Change-Id: If1eca4485387ae15513164b4b3a126debe5661e0 Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ tests/parser/inifile/data/2.ini | 2 ++ tests/parser/inifile/iniparser_test.cc | 2 +- zypp/parser/IniParser.cc | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 46c9884..0b5785d 100644 --- 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 db69894..97a043d 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +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 - Fix SEGV when dumping rpm header with epoch (bnc#929483) diff --git a/tests/parser/inifile/data/2.ini b/tests/parser/inifile/data/2.ini index 049247a..36d21c8 100644 --- 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 8857bd3..fb43929 100644 --- 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 §ion ) { MIL << section << endl; - BOOST_CHECK(section == "base" || section == "equal"); + BOOST_CHECK(section == "base" || section == "equal" || section == "te]st"); } virtual void consume( const std::string §ion, const std::string &key, const std::string &value ) diff --git a/zypp/parser/IniParser.cc b/zypp/parser/IniParser.cc index cdead1e..9958f66 100644 --- 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); -- 2.7.4