Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / Capability.cc

diff --git a/zypp/Capability.cc b/zypp/Capability.cc
index 70b027c..ef2337c 100644 (file)
--- a/zypp/Capability.cc
+++ b/zypp/Capability.cc
@@ -299,15 +299,6 @@ namespace zypp
   : _id( relFromStr( myPool().getPool(), arch_r, name_r, op_r, ed_r, prefix_r ) )
   {}
 
-  ///////////////////////////////////////////////////////////////////
-  // Ctor creating a namespace: capability.
-  ///////////////////////////////////////////////////////////////////
-
-  Capability::Capability( ResolverNamespace namespace_r, IdString value_r )
-  : _id( ::pool_rel2id( myPool().getPool(), asIdString(namespace_r).id(), (value_r.empty() ? STRID_NULL : value_r.id() ), REL_NAMESPACE, /*create*/true ) )
-  {}
-
-
   const char * Capability::c_str() const
   { return( _id ? ::pool_dep2str( myPool().getPool(), _id ) : "" ); }
 
@@ -381,7 +372,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