Merge pull request #14909 from NixOS/backport-tarball-pct-decode-to-2.31-maintenance

Ericson2314 · web-flow · commit 952c82396046 · 2026-01-04T17:41:30.000-05:00
libfetchers: Actually percentDecode path when using the path from fil…
diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
@@ -115,7 +115,7 @@ static DownloadTarballResult downloadTarball_(
     // it is not in fact a tarball.
     if (url.rfind("file://", 0) == 0) {
         // Remove "file://" prefix to get the local file path
-        std::string localPath = url.substr(7);
+        std::string localPath = percentDecode(url.substr(7));
         if (!std::filesystem::exists(localPath)) {
             throw Error("tarball '%s' does not exist.", localPath);
         }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ static DownloadTarballResult downloadTarball_(`
`115`	`115`	`// it is not in fact a tarball.`
`116`	`116`	`if (url.rfind("file://", 0) == 0) {`
`117`	`117`	`// Remove "file://" prefix to get the local file path`
`118`		`- std::string localPath = url.substr(7);`
	`118`	`+ std::string localPath = percentDecode(url.substr(7));`
`119`	`119`	`if (!std::filesystem::exists(localPath)) {`
`120`	`120`	`throw Error("tarball '%s' does not exist.", localPath);`
`121`	`121`	`}`