* Have apt-cache show exit with an error if it cannot f...

Author: mdz
Date: 2003-07-22 03:10:01 GMT
* Have apt-cache show exit with an error if it cannot find any of the
specified packages (Closes: #101490)

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index df68f78333c80c6f125ac5a3c13ef7a11afea2de..a9e9e6062c26d1f4bc17ff244aa96ae52959f159 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-cache.cc,v 1.64 2003/05/15 09:39:38 piefel Exp $
+// $Id: apt-cache.cc,v 1.65 2003/07/22 03:10:01 mdz Exp $

 /* ######################################################################
    
    apt-cache - Manages the cache files
 /* ######################################################################
    
    apt-cache - Manages the cache files


@@ -1344,6 +1344,8 @@ bool ShowPackage(CommandLine &CmdL)
 {   
    pkgCache &Cache = *GCache;
    pkgDepCache::Policy Plcy;
 {   
    pkgCache &Cache = *GCache;
    pkgDepCache::Policy Plcy;

+
+   unsigned found = 0;

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


@@ -1354,6 +1356,8 @@ bool ShowPackage(CommandLine &CmdL)
         continue;
       }
 
         continue;
       }
 

+      ++found;
+

       // 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)
       {


@@ -1373,7 +1377,10 @@ bool ShowPackage(CommandLine &CmdL)
            return false;
       }      
    }
            return false;
       }      
    }

-   return true;
+
+   if (found > 0)
+        return true;
+   return _error->Error(_("No packages found"));

 }
                                                                        /*}}}*/
 // ShowPkgNames - Show package names                                   /*{{{*/
 }
                                                                        /*}}}*/
 // ShowPkgNames - Show package names                                   /*{{{*/

diff --git a/debian/changelog b/debian/changelog
index 91c8b1d247ef3ea961f60072e36df92ebddd6876..21ab9031a447439e7b3afd05ccb3845f7ee65ff8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ apt (0.5.7) unstable; urgency=low
     archives and not changing the system (Closes: #190862)
   * Skip version check if a build-dependency is provided by an installed package
     (Closes: #126938)
     archives and not changing the system (Closes: #190862)
   * Skip version check if a build-dependency is provided by an installed package
     (Closes: #126938)

+  * Have apt-cache show exit with an error if it cannot find any of the
+    specified packages (Closes: #101490)

 
  --
 
 
  --