summaryrefslogtreecommitdiff
path: root/methods/gpgv.cc
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2020-12-18 21:00:29 +0000
committerJulian Andres Klode <jak@debian.org>2020-12-18 21:00:29 +0000
commit06ec0067057e0578f3bc515f6a97d6a9d70824f6 (patch)
treee0cb170d0a4f8caff89c2402bf24e6951b716360 /methods/gpgv.cc
parentece7f5bb0afee0994a4fb4380e756ce725fe67a9 (diff)
parenta5859bafdaa6bcf12934d0fb1715a5940965e13a (diff)
Merge branch 'pu/uriencode' into 'master'
Use encoded URIs in the acquire system See merge request apt-team/apt!139
Diffstat (limited to 'methods/gpgv.cc')
-rw-r--r--methods/gpgv.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 5597e7cff..08d030a17 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -123,7 +123,7 @@ class GPGVMethod : public aptMethod
protected:
virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE;
public:
- GPGVMethod() : aptMethod("gpgv", "1.1", SingleInstance | SendConfig){};
+ GPGVMethod() : aptMethod("gpgv", "1.1", SingleInstance | SendConfig | SendURIEncoded){};
};
static void PushEntryWithKeyID(std::vector<std::string> &Signers, char * const buffer, bool const Debug)
{
@@ -419,7 +419,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
{
URI const Get(Itm->Uri);
- string const Path = Get.Host + Get.Path; // To account for relative paths
+ std::string const Path = DecodeSendURI(Get.Host + Get.Path); // To account for relative paths
SignersStorage Signers;
std::vector<std::string> keyFpts, keyFiles;