Imported Upstream version 16.2.5

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 4989410aaae02d7827e517aa2d4d221b7093cbda..d3bee9d60e48006d750d1f38047ab05bf9a16d1a 100644 (file)
--- 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 "4")
+SET(LIBZYPP_PATCH "5")
 #
-# LAST RELEASED: 16.2.4 (0)
+# LAST RELEASED: 16.2.5 (0)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 8909cff1cf8029d5db8b184ad8ef378805a0d67f..ba6e5c4ac8f2a66673821ed27f40518e167fd77f 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 20 11:41:48 CEST 2016 - ma@suse.de
+
+- guessPackageSpec: Don't break globbing (fixes openSUSE/zypper#97)
+- version 16.2.5 (0)
+
 -------------------------------------------------------------------
 Thu Sep 15 15:27:15 CEST 2016 - ma@suse.de
 

diff --git a/zypp/Capability.cc b/zypp/Capability.cc
index c24d32d18b6b28c7ebfd3604ccb429ddbe0eac43..3147c8af90b705ba1ec3a250a4eb631b7eee8100 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
 

diff --git a/zypp/sat/detail/PoolImpl.cc b/zypp/sat/detail/PoolImpl.cc
index 35f9f1bee72fb06fcc24dd30909486f0c24da690..f88fb548985f841575e929391f1d25c274b87f26 100644 (file)
--- a/zypp/sat/detail/PoolImpl.cc
+++ b/zypp/sat/detail/PoolImpl.cc
@@ -107,6 +107,12 @@ namespace zypp
 
       static void logSat( CPool *, void *data, int type, const char *logString )
       {
+       //                            "1234567890123456789012345678901234567890
+       if ( 0 == strncmp( logString, "  - no rule created", 19 ) )
+         return;
+       if ( 0 == strncmp( logString, "    next rules: 0 0", 19 ) )
+         return;
+
          if ( type & (SOLV_FATAL|SOLV_ERROR) ) {
            L_ERR("libsolv") << logString;
          } else if ( type & SOLV_DEBUG_STATS ) {