cmdline/apt-cache.cc: Change behavior of showsrc to match the one of show (Closes...

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 286f306cdbc79f2a94e802a5e5eb6779c63f1726..3f68579cc0386b933dc8700dc3ae748490cda212 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1498,15 +1498,26 @@ bool ShowSrcPackage(CommandLine &CmdL)
    if (_error->PendingError() == true)
       return false;
 
    if (_error->PendingError() == true)
       return false;
 

+   unsigned found = 0;

    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
       SrcRecs.Restart();
       
       pkgSrcRecords::Parser *Parse;
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
       SrcRecs.Restart();
       
       pkgSrcRecords::Parser *Parse;

-      while ((Parse = SrcRecs.Find(*I,false)) != 0)
-        cout << Parse->AsStr() << endl;;
+      unsigned found_this = 0;
+      while ((Parse = SrcRecs.Find(*I,false)) != 0) {
+        cout << Parse->AsStr() << endl;;
+        found++;
+        found_this++;
+      }
+      if (found_this == 0) {
+        _error->Warning(_("Unable to locate package %s"),*I);
+        continue;
+      }

    }      
    }      

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

 }
                                                                        /*}}}*/
 // Policy - Show the results of the preferences file                   /*{{{*/
 }
                                                                        /*}}}*/
 // Policy - Show the results of the preferences file                   /*{{{*/

diff --git a/debian/changelog b/debian/changelog
index cc5b03a6314b712c850793f11250762f530ffcdf..fc5d0f90c9ec6087c5fa83de054608a4acdcd6ba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low
     that package that was providing some manpages for APT utilities.
 
   [ Julian Andres Klode ]
     that package that was providing some manpages for APT utilities.
 
   [ Julian Andres Klode ]

+  * cmdline/apt-cache.cc:
+    - Change behavior of showsrc to match the one of show (Closes: #512046).

   * cmdline/apt-key:
     - Honor Apt::GPGV::TrustedKeyring (Closes: #316390)
   * cmdline/apt-mark:
   * cmdline/apt-key:
     - Honor Apt::GPGV::TrustedKeyring (Closes: #316390)
   * cmdline/apt-mark: