github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix can't edit object by using ctr content edit command

Browse Source 
Signed-off-by: zhang he <zhanghe9702@163.com>
This commit is contained in:
zhanghe9702 2022-04-24 18:53:04 +08:00
parent 7eae7f206c
commit b8bb33b92d
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/ctr/commands/content/content.go
View File

@ -512,7 +512,7 @@ var (
} }
) )
func edit(context *cli.Context, rd io.Reader) (io.ReadCloser, error) { func edit(context *cli.Context, rd io.Reader) (_ io.ReadCloser, retErr error) {
editor := context.String("editor") editor := context.String("editor")
if editor == "" { if editor == "" {
return nil, fmt.Errorf("editor is required") return nil, fmt.Errorf("editor is required")
@ -523,8 +523,14 @@ func edit(context *cli.Context, rd io.Reader) (io.ReadCloser, error) {
return nil, err return nil, err
} }
if _, err := io.Copy(tmp, rd); err != nil { defer func() {
if retErr != nil {
os.Remove(tmp.Name())
}
}()
_, err = io.Copy(tmp, rd)
tmp.Close() tmp.Close()
if err != nil {
return nil, err return nil, err
} }
@ -536,17 +542,15 @@ func edit(context *cli.Context, rd io.Reader) (io.ReadCloser, error) {
cmd.Env = os.Environ() cmd.Env = os.Environ()
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
tmp.Close()
return nil, err return nil, err
} }
// The editor might recreate new file and override the original one. We should reopen the file
if _, err := tmp.Seek(0, io.SeekStart); err != nil { edited, err := os.OpenFile(tmp.Name(), os.O_RDONLY, 0600)
tmp.Close() if err != nil {
return nil, err return nil, err
} }
return onCloser{ReadCloser: edited, onClose: func() error {
return onCloser{ReadCloser: tmp, onClose: func() error { return os.RemoveAll(edited.Name())
return os.RemoveAll(tmp.Name())
}}, nil }}, nil
} }