Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions sandbox/sandbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,22 @@ func Make(ctx context.Context, cfg MakeConfig) error {
}
untarDedup.Add(to)

err := xfs.CreateParentDir(to)
err = xfs.CreateParentDir(to)
if err != nil {
return err
}

err = os.Link(file.From, to)
if err != nil {
return fmt.Errorf("make: link %v to %v: %w", file.From, to, err)
target, err := os.Readlink(file.From)
if err == nil {
err = os.Symlink(target, to)
if err != nil {
return err
}
} else {
err = os.Link(file.From, to)
if err != nil {
return fmt.Errorf("make: link %v to %v: %w", file.From, to, err)
}
}

if cfg.ProgressLinks != nil {
Expand Down
6 changes: 6 additions & 0 deletions utils/xstarlark/fmt/fmt.go
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,12 @@ func (f *formatter) formatStmt(w Writer, sstmt syntax.Stmt) error {
return err
}
case *syntax.ReturnStmt:
if stmt.Result == nil {
w.WriteString("return")

return nil
}

w.WriteString("return ")
return f.formatExpr(w, stmt.Result)
case *IfStmt:
Expand Down
Loading