diff options
author | Julian Andres Klode <jak@debian.org> | 2020-12-18 21:00:29 +0000 |
---|---|---|
committer | Julian Andres Klode <jak@debian.org> | 2020-12-18 21:00:29 +0000 |
commit | 06ec0067057e0578f3bc515f6a97d6a9d70824f6 (patch) | |
tree | e0cb170d0a4f8caff89c2402bf24e6951b716360 /methods/store.cc | |
parent | ece7f5bb0afee0994a4fb4380e756ce725fe67a9 (diff) | |
parent | a5859bafdaa6bcf12934d0fb1715a5940965e13a (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/store.cc')
-rw-r--r-- | methods/store.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/methods/store.cc b/methods/store.cc index 1b0f07947..8ffc7b93d 100644 --- a/methods/store.cc +++ b/methods/store.cc @@ -36,7 +36,7 @@ class StoreMethod : public aptMethod public: - explicit StoreMethod(std::string &&pProg) : aptMethod(std::move(pProg),"1.2",SingleInstance | SendConfig) + explicit StoreMethod(std::string &&pProg) : aptMethod(std::move(pProg),"1.2",SingleInstance | SendConfig | SendURIEncoded) { SeccompFlags = aptMethod::BASE; if (Binary != "store") @@ -64,7 +64,7 @@ static bool OpenFileWithCompressorByName(FileFd &fileFd, std::string const &File bool StoreMethod::Fetch(FetchItem *Itm) /*{{{*/ { URI Get(Itm->Uri); - std::string Path = Get.Host + Get.Path; // To account for relative paths + std::string Path = DecodeSendURI(Get.Host + Get.Path); // To account for relative paths FetchResult Res; Res.Filename = Itm->DestFile; |