mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "dependency path outside project" error for nested local path dependencies

Browse Source 
Closes #23076
This commit is contained in:
Carl Åstholm 2025-03-04 14:56:18 +01:00 committed by Andrew Kelley
parent 711b0fef58
commit 8363b95178
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Package/Fetch.zig
View File

@ -331,9 +331,17 @@ pub fn run(f: *Fetch) RunError!void {
// prefix of "p/$hash/". // prefix of "p/$hash/".
const prefix_len: usize = if (f.job_queue.read_only) 0 else "p/".len; const prefix_len: usize = if (f.job_queue.read_only) 0 else "p/".len;
const parent_sub_path = f.parent_package_root.sub_path; const parent_sub_path = f.parent_package_root.sub_path;
const end = std.mem.indexOfScalarPos(u8, parent_sub_path, prefix_len, fs.path.sep) orelse const end = find_end: {
parent_sub_path.len; if (parent_sub_path.len > prefix_len) {
const expected_prefix = parent_sub_path[prefix_len..end]; // Use `isSep` instead of `indexOfScalarPos` to account for
// Windows accepting both `\` and `/` as path separators.
for (parent_sub_path[prefix_len..], prefix_len..) |c, i| {
if (std.fs.path.isSep(c)) break :find_end i;
}
}
break :find_end parent_sub_path.len;
};
const expected_prefix = parent_sub_path[0..end];
if (!std.mem.startsWith(u8, pkg_root.sub_path, expected_prefix)) { if (!std.mem.startsWith(u8, pkg_root.sub_path, expected_prefix)) {
return f.fail( return f.fail(
f.location_tok, f.location_tok,