Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / tools / zypp-NameReqPrv.cc

diff --git a/tools/zypp-NameReqPrv.cc b/tools/zypp-NameReqPrv.cc
index d2d669a..ca22da3 100644 (file)
--- a/tools/zypp-NameReqPrv.cc
+++ b/tools/zypp-NameReqPrv.cc
@@ -40,7 +40,6 @@ int usage( const std::string & msg_r = std::string(), int exit_r = 100 )
   cerr << "  -o/-O    turn on/off looking for obsoletes   (default off)" << endl;
   cerr << "  -m/-M    turn on/off looking for recommends  (default off)" << endl;
   cerr << "  -s/-S    turn on/off looking for supplements (default off)" << endl;
-  cerr << "  -e/-E    turn on/off looking for enhan./sugg.(default off)" << endl;
   cerr << "  -a       short for -n -p -r" << endl;
   cerr << "  -A       short for -n -P -R" << endl;
   cerr << "  -D <pkg> dump dependencies of <pkg>" << endl;
@@ -79,7 +78,11 @@ void dDump( const std::string & spec_r )
   for ( const auto & el : q )
   {
     message << endl << "==============================" << endl << dump(el);
-    if ( isKind<Pattern>(el) )
+    if ( isKind<Product>(el) )
+    {
+      message << endl << "REPLACES: " << make<Product>(el)->replacedProducts();
+    }
+    else if ( isKind<Pattern>(el) )
     {
       message << endl << "CONTENT: " << make<Pattern>(el)->contents();
     }
@@ -198,7 +201,6 @@ int main( int argc, char * argv[] )
   bool obsoletes       ( false );
   bool recommends      ( false );
   bool supplements     ( false );
-  bool enhacements     ( false );
 
   for ( ; argc; --argc,++argv )
   {
@@ -233,8 +235,6 @@ int main( int argc, char * argv[] )
         case 'M': recommends = false;  break;
         case 's': supplements =        true;   break;
         case 'S': supplements =        false;  break;
-        case 'e': enhacements =        true;   break;
-        case 'E': enhacements =        false;  break;
       }
       continue;
     }
@@ -284,29 +284,22 @@ int main( int argc, char * argv[] )
        q.addDependency( sat::SolvAttr::recommends );
       if ( supplements )
        q.addDependency( sat::SolvAttr::supplements );
-      if ( enhacements )
-      {
-       q.addDependency( sat::SolvAttr::enhances );
-       q.addDependency( sat::SolvAttr::suggests );
-      }
     }
 
     message << *argv << " [" << (ignorecase?'i':'_') << (names?'n':'_') << (requires?'r':'_') << (provides?'p':'_')
-    << (conflicts?'c':'_') << (obsoletes?'o':'_') << (recommends?'m':'_') << (supplements?'s':'_') << (enhacements?'e':'_')
-    << "] {" << endl;
+    << (conflicts?'c':'_') << (obsoletes?'o':'_') << (recommends?'m':'_') << (supplements?'s':'_') << "] {" << endl;
 
     for_( it, q.begin(), q.end() )
     {
       tableOut( str::numstring( it->id() ), it->asString(),
                str::form( "(%d)%s", it->repository().info().priority(), it->repository().name().c_str() ),
+               it->vendor().asString(),
                str::numstring( PoolItem(*it)->buildtime() ) );
-      tableOut( "", "",
-               it->vendor().asString() );
       if ( ! it.matchesEmpty() )
       {
        for_( match, it.matchesBegin(), it.matchesEnd() )
        {
-         tableOut( "", "", match->inSolvAttr().asString().substr( 9, 3 )+": " +match->asString() );
+         tableOut( "", "", "", match->inSolvAttr().asString().substr( 9, 3 )+": " +match->asString() );
        }
       }
     }