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/copy.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/copy.cc')
-rw-r--r-- | methods/copy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/methods/copy.cc b/methods/copy.cc index 9a8665446..82eed150c 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -29,7 +29,7 @@ class CopyMethod : public aptMethod virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE; public: - CopyMethod() : aptMethod("copy", "1.0", SingleInstance | SendConfig) + CopyMethod() : aptMethod("copy", "1.0", SingleInstance | SendConfig | SendURIEncoded) { SeccompFlags = aptMethod::BASE; } @@ -41,7 +41,7 @@ class CopyMethod : public aptMethod bool CopyMethod::Fetch(FetchItem *Itm) { // this ensures that relative paths work in copy - std::string const File = Itm->Uri.substr(Itm->Uri.find(':')+1); + std::string const File = DecodeSendURI(Itm->Uri.substr(Itm->Uri.find(':')+1)); // Stat the file and send a start message struct stat Buf; |