* merged with apt--mvo

[apt.git] / cmdline / apt-cache.cc

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 3bd1435fc3c8e625a67f08b800c0396e6c31d490..aea9ebeba178f18946f656a0f2166610be076664 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1360,20 +1360,6 @@ bool ShowPackage(CommandLine &CmdL)
 
       ++found;
 
 
       ++found;
 

-      // Show virtual packages
-      if (Pkg->ProvidesList != 0)
-      {
-        ioprintf(std::cout,_("Package %s is a virtual package provided by:\n"),
-                 Pkg.Name());
-        
-        pkgCache::PrvIterator I = Pkg.ProvidesList();
-        for (; I.end() == false; I++)
-           cout << "  " << I.OwnerPkg().Name() << endl;
-        cout << _("You should explicitly select one to show.") << endl;
-        continue;
-      }
-
-

       // Find the proper version to use.
       if (_config->FindB("APT::Cache::AllVersions","true") == true)
       {
       // Find the proper version to use.
       if (_config->FindB("APT::Cache::AllVersions","true") == true)
       {


@@ -1588,10 +1574,11 @@ bool Madison(CommandLine &CmdL)
 
    pkgCache &Cache = *GCache;
 
 
    pkgCache &Cache = *GCache;
 

-   // Create the text record parsers
+   // Create the src text record parsers and ignore errors about missing
+   // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords

    pkgSrcRecords SrcRecs(*SrcList);
    if (_error->PendingError() == true)
    pkgSrcRecords SrcRecs(*SrcList);
    if (_error->PendingError() == true)

-      return false;
+      _error->Discard();

 
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
 
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {