From b0ce7c65309585d4b9752bb571a0e616036eb162 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Thu, 14 Jan 2016 09:28:47 +0100
Subject: Do not show multiple identical apt-cache showsrc entries

Closes: #734922
---
 apt-private/private-show.cc | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'apt-private')

diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc
index c2517e130..6fb3791f8 100644
--- a/apt-private/private-show.cc
+++ b/apt-private/private-show.cc
@@ -299,6 +299,14 @@ bool ShowPackage(CommandLine &CmdL)					/*{{{*/
    return true;
 }
 									/*}}}*/
+// XXX: move to hashes.h: HashString::FromString() ?			/*{{{*/
+std::string Sha1FromString(std::string input)
+{
+   SHA1Summation sha1;
+   sha1.Add(input.c_str(), input.length());
+   return sha1.Result().Value();
+}
+									/*}}}*/
 bool ShowSrcPackage(CommandLine &CmdL)					/*{{{*/
 {
    pkgCacheFile CacheFile;
@@ -312,6 +320,8 @@ bool ShowSrcPackage(CommandLine &CmdL)					/*{{{*/
       return false;
 
    bool found = false;
+   // avoid showing identical records
+   std::set<std::string> seen;
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
       SrcRecs.Restart();
@@ -323,9 +333,14 @@ bool ShowSrcPackage(CommandLine &CmdL)					/*{{{*/
 	 if (_config->FindB("APT::Cache::Only-Source", false) == true)
 	    if (Parse->Package() != *I)
 	       continue;
-	 std::cout << Parse->AsStr() << std::endl;;
-	 found = true;
-	 found_this = true;
+         std::string sha1str = Sha1FromString(Parse->AsStr());
+         if (std::find(seen.begin(), seen.end(), sha1str) == seen.end())
+         {
+            std::cout << Parse->AsStr() << std::endl;;
+            found = true;
+            found_this = true;
+            seen.insert(sha1str);
+         }
       }
       if (found_this == false) {
 	 _error->Warning(_("Unable to locate package %s"),*I);
-- 
cgit v1.2.3