Fix bug in PoolQuery::addDependency

diff --git a/tests/zypp/PoolQuery_test.cc b/tests/zypp/PoolQuery_test.cc
index 7d77851..19a7ab4 100644 (file)
--- a/tests/zypp/PoolQuery_test.cc
+++ b/tests/zypp/PoolQuery_test.cc
@@ -778,6 +778,28 @@ BOOST_AUTO_TEST_CASE(addDependency)
     //dumpQ( std::cout, q );
     BOOST_CHECK_EQUAL( q.size(), 0 );
   }
+  {
+    cout << "****addDependency2d****"  << endl;
+    PoolQuery q;
+    q.setCaseSensitive( false );
+    q.setMatchSubstring();
+    // libzypp provides yast2-packagemanager...
+    q.addDependency( sat::SolvAttr::provides, "yast2-packagemanager", Arch_i586 ); // AND with arch i585
+    std::for_each(q.begin(), q.end(), PrintAndCount());
+    //dumpQ( std::cout, q );
+    BOOST_CHECK_EQUAL( q.size(), 2 );
+  }
+  {
+    cout << "****addDependency2e****"  << endl;
+    PoolQuery q;
+    q.setCaseSensitive( false );
+    q.setMatchSubstring();
+    // but no package named yast2-packagemanager
+    q.addDependency( sat::SolvAttr::name, "yast2-packagemanager", Arch_i586 ); // AND with arch i585
+    std::for_each(q.begin(), q.end(), PrintAndCount());
+    //dumpQ( std::cout, q );
+    BOOST_CHECK_EQUAL( q.size(), 0 );
+  }
 
   {
     cout << "****addDependency3****"  << endl;

diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc
index fbb0ce0..c2caef6 100644 (file)
--- a/zypp/PoolQuery.cc
+++ b/zypp/PoolQuery.cc
@@ -850,8 +850,11 @@ attremptycheckend:
     {
       case Rel::ANY_e: // no additional constraint on edition.
         if ( arch.empty() )    // no additional constraint on arch.
+       {
          addAttribute( attr, name );
-        return;
+         return;
+       }
+       break;
 
       case Rel::NONE_e:        // will never match.
         return;