Imported Upstream version 15.22.5

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 06a2d53..6c19dc9 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "15")
 SET(LIBZYPP_COMPATMINOR "19")
 SET(LIBZYPP_MINOR "22")
-SET(LIBZYPP_PATCH "4")
+SET(LIBZYPP_PATCH "5")
 #
-# LAST RELEASED: 15.22.4 (19)
+# LAST RELEASED: 15.22.5 (19)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index a3a15c4..88f4bc1 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Sep 16 12:57:51 CEST 2016 - ma@suse.de
+
+- guessPackageSpec: Don't break globbing (fixes openSUSE/zypper#97)
+- version 15.22.5 (19)
+
+-------------------------------------------------------------------
 Thu Sep 15 15:28:51 CEST 2016 - ma@suse.de
 
 - RepoFileReader: fix parsing of multiline url entries (bsc#964932)

diff --git a/zypp/Capability.cc b/zypp/Capability.cc
index c24d32d..3147c8a 100644 (file)
--- a/zypp/Capability.cc
+++ b/zypp/Capability.cc
@@ -381,7 +381,9 @@ namespace zypp
 
     // str_r might be the form "libzypp-1.2.3-4.5(.arch)'
     // correctly parsed as name capability by the ctor.
-    if ( detail.isNamed() && ::strrchr( detail.name().c_str(), '-' ) && sat::WhatProvides( cap ).empty() )
+    // TODO: Think about allowing glob char in name - for now don't process
+    if ( detail.isNamed() && !::strpbrk( detail.name().c_str(), "*?[{" )
+      && ::strrchr( detail.name().c_str(), '-' ) && sat::WhatProvides( cap ).empty() )
     {
       Arch origArch( detail.arch() ); // to support a trailing .arch