From 67a0eb3f18fb012d874d4be4d8bff404eecfc168 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Nov 2016 11:15:59 +0900 Subject: [PATCH] Imported Upstream version 16.2.5 Change-Id: I286500ac984587ebe6922b7a79fe07b08bb56ed7 Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ zypp/Capability.cc | 4 +++- zypp/sat/detail/PoolImpl.cc | 6 ++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 4989410..d3bee9d 100644 --- 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 8909cff..ba6e5c4 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +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 - RepoFileReader: fix parsing of multiline url entries (bsc#964932) diff --git a/zypp/Capability.cc b/zypp/Capability.cc index c24d32d..3147c8a 100644 --- 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 35f9f1b..f88fb54 100644 --- 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 ) { -- 2.7.4