From: Julian Andres Klode <jak@debian.org>
Date: Sun, 15 May 2016 17:16:54 +0000 (+0200)
Subject: Add conflicting Signed-By values to error message
X-Git-Tag: 1.3_exp2~58
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a9fd02dec56bcb3d7485ae286fad665aeed7cda4?ds=inline

Add conflicting Signed-By values to error message

This hopefully makes debugging things easier.
---

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index aad7df735..71aee3f72 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -692,7 +692,7 @@ bool debReleaseIndex::SetSignedBy(std::string const &pSignedBy)
       }
    }
    else if (SignedBy != pSignedBy)
-      return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), "Signed-By", URI.c_str(), Dist.c_str());
+      return _error->Error(_("Conflicting values set for option %s regarding source %s %s: %s != %s"), "Signed-By", URI.c_str(), Dist.c_str(), SignedBy.c_str(), pSignedBy.c_str());
    return true;
 }
 									/*}}}*/