Deduplicate EDSP Provides line of M-A:foreign packages

M-A:foreign causes Provides to apply to all architectures and as we
wanted to avoid resolver changes for M-A those are done by explicitly
creating these provides instead of forcing the resolvers to learn about
this. The EDSP is a different beast though & we don't need this trick
here especially as it leads to needless (but harmless) duplication.

No sort+unique is done to avoid changing order (not that it should
matter, but just to be sure), but the sets should be small enough to not
make a huge difference either way.

2 files changed, 18 insertions, 10 deletions

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 9f9976ef5..7e3993be4 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -29,8 +29,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <algorithm>
 #include <array>
 #include <limits>
+#include <sstream>
 #include <string>
 
 #include <apti18n.h>
@@ -119,19 +121,25 @@ static bool WriteScenarioDependency(FileFd &output, pkgCache::VerIterator const
    for (size_t i = 1; i < dependencies.size(); ++i)
       if (dependencies[i].empty() == false)
 	 WriteOkay(Okay, output, "\n", DepMap[i], ": ", dependencies[i]);
-   string provides;
-   for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv)
+   std::vector<std::string> provides;
+   for (auto Prv = Ver.ProvidesList(); not Prv.end(); ++Prv)
    {
-      if (Prv.IsMultiArchImplicit() == true)
+      if (Prv.IsMultiArchImplicit())
 	 continue;
-      if (provides.empty() == false)
-	 provides.append(", ");
-      provides.append(Prv.Name());
+      std::string provide = Prv.Name();
       if (Prv->ProvideVersion != 0)
-	 provides.append(" (= ").append(Prv.ProvideVersion()).append(")");
+	 provide.append(" (= ").append(Prv.ProvideVersion()).append(")");
+      if ((Ver->MultiArch & pkgCache::Version::Foreign) != 0 && std::find(provides.cbegin(), provides.cend(), provide) != provides.cend())
+	 continue;
+      provides.emplace_back(std::move(provide));
+   }
+   if (not provides.empty())
+   {
+      std::ostringstream out;
+      std::copy(provides.begin(), provides.end() - 1, std::ostream_iterator<std::string>(out, ", "));
+      out << provides.back();
+      WriteOkay(Okay, output, "\nProvides: ", out.str());
    }
-   if (provides.empty() == false)
-      WriteOkay(Okay, output, "\nProvides: ", provides);
    return WriteOkay(Okay, output, "\n");
 }
 									/*}}}*/
diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol
index 33d78be2a..0091263b7 100755
--- a/test/integration/test-external-dependency-solver-protocol
+++ b/test/integration/test-external-dependency-solver-protocol
@@ -312,7 +312,7 @@ Dependencies:
 Provides: 
 1 - ./incoming/dummy-webserver_1_all.deb (= 1) httpd:armhf (= ) httpd:armel (= ) httpd:i386 (= ) httpd (= ) 
 Reverse Provides: ' tail -n 6 showpkg.output
-testsuccessequal 'Provides: httpd, httpd, httpd, httpd
+testsuccessequal 'Provides: httpd
 Provides: httpd
 Provides: httpd
 Provides: httpd