1 files changed, 6 insertions, 6 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 225c4304a..d6ffaf34d 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -3853,16 +3853,16 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *const Owner, string const &URI, HashStringLis
 		       const string &DestDir, const string &DestFilename,
 		       bool const IsIndexFile) : Item(Owner), d(NULL), IsIndexFile(IsIndexFile), ExpectedHashes(Hashes)
 {
+   ::URI url{URI};
+   if (url.Path.find(' ') != std::string::npos || url.Path.find('%') == std::string::npos)
+      url.Path = pkgAcquire::URIEncode(url.Path);
+
    if(!DestFilename.empty())
       DestFile = DestFilename;
    else if(!DestDir.empty())
-      DestFile = DestDir + "/" + flNotDir(URI);
+      DestFile = DestDir + "/" + DeQuoteString(flNotDir(url.Path));
    else
-      DestFile = flNotDir(URI);
-
-   ::URI url{URI};
-   if (url.Path.find(' ') != std::string::npos || url.Path.find('%') == std::string::npos)
-      url.Path = pkgAcquire::URIEncode(url.Path);
+      DestFile = DeQuoteString(flNotDir(url.Path));
 
    // Create the item
    Desc.URI = std::string(url);