authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-07-20 16:39:13+03:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-07-28 15:20:01-07:00
logece1d1daf476fdffc69279c686ad1e2101ce6e4d
tree7934bd543a744c6f7da7ba9527a7656088d1c3f8
parent02acde99a142e89c30d0e49cc703d0ad80ea31b7

CLI: add error for duplicate package

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

src/main.zig+6
...@@ -858,6 +858,12 @@ fn buildOutputType(...@@ -858,6 +858,12 @@ fn buildOutputType(
858 ) catch |err| {858 ) catch |err| {
859 fatal("Failed to add package at path {s}: {s}", .{ pkg_path.?, @errorName(err) });859 fatal("Failed to add package at path {s}: {s}", .{ pkg_path.?, @errorName(err) });
860 };860 };
861
862 if (mem.eql(u8, pkg_name.?, "std") or mem.eql(u8, pkg_name.?, "root") or mem.eql(u8, pkg_name.?, "builtin")) {
863 fatal("unable to add package '{s}' -> '{s}': conflicts with builtin package", .{ pkg_name.?, pkg_path.? });
864 } else if (cur_pkg.table.get(pkg_name.?)) |prev| {
865 fatal("unable to add package '{s}' -> '{s}': already exists as '{s}", .{ pkg_name.?, pkg_path.?, prev.root_src_path });
866 }
861 try cur_pkg.addAndAdopt(gpa, pkg_name.?, new_cur_pkg);867 try cur_pkg.addAndAdopt(gpa, pkg_name.?, new_cur_pkg);
862 cur_pkg = new_cur_pkg;868 cur_pkg = new_cur_pkg;
863 } else if (mem.eql(u8, arg, "--pkg-end")) {869 } else if (mem.eql(u8, arg, "--pkg-end")) {