authorgravatar for dev@liujiacai.netjiacai2050 <dev@liujiacai.net> 2023-03-04 10:47:25+08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-03-05 14:59:34-05:00
log29c56a8aa74d1b1a19bece5ba5d738af1e3c9f6d
tree32e8a3f3882e39b47eebb4a9c7107382c492ed22
parent7b01af2bfd4cf9232fb0157c26d7c59642452fab

fix package redeclaration when cache is not found

1 files changed, 6 insertions(+), 6 deletions(-)

src/Package.zig+6-6
......@@ -432,6 +432,12 @@ fn fetchAndUnpack(
432432 const build_root = try global_cache_directory.join(gpa, &.{pkg_dir_sub_path});
433433 errdefer gpa.free(build_root);
434434
435 var pkg_dir = global_cache_directory.handle.openDir(pkg_dir_sub_path, .{}) catch |err| switch (err) {
436 error.FileNotFound => break :cached,
437 else => |e| return e,
438 };
439 errdefer pkg_dir.close();
440
435441 try build_roots_source.writer().print(" pub const {s} = \"{}\";\n", .{
436442 std.zig.fmtId(fqn), std.zig.fmtEscapes(build_root),
437443 });
......@@ -444,12 +450,6 @@ fn fetchAndUnpack(
444450 return gop.value_ptr.*;
445451 }
446452
447 var pkg_dir = global_cache_directory.handle.openDir(pkg_dir_sub_path, .{}) catch |err| switch (err) {
448 error.FileNotFound => break :cached,
449 else => |e| return e,
450 };
451 errdefer pkg_dir.close();
452
453453 const ptr = try gpa.create(Package);
454454 errdefer gpa.destroy(ptr);
455455