Skip to content

Commit fe897a2

Browse files
committed
fix rebase
1 parent f4befb1 commit fe897a2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/Compilation.zig

+6-2
Original file line numberDiff line numberDiff line change
@@ -3762,7 +3762,7 @@ fn docsCopyModule(comp: *Compilation, module: *Package.Module, name: []const u8,
37623762
defer walker.deinit();
37633763

37643764
var archiver = std.tar.writer(tar_file.writer().any());
3765-
archiver.prefix = module.fully_qualified_name;
3765+
archiver.prefix = name;
37663766

37673767
while (try walker.next()) |entry| {
37683768
switch (entry.kind) {
@@ -3773,7 +3773,11 @@ fn docsCopyModule(comp: *Compilation, module: *Package.Module, name: []const u8,
37733773
},
37743774
else => continue,
37753775
}
3776-
var file = try entry.dir.openFile(entry.basename, .{});
3776+
var file = mod_dir.openFile(entry.path, .{}) catch |err| {
3777+
return comp.lockAndSetMiscFailure(.docs_copy, "unable to open '{}{s}': {s}", .{
3778+
root, entry.path, @errorName(err),
3779+
});
3780+
};
37773781
defer file.close();
37783782
archiver.writeFile(entry.path, file) catch |err| {
37793783
return comp.lockAndSetMiscFailure(.docs_copy, "unable to archive '{}{s}': {s}", .{

0 commit comments

Comments
 (0)