suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-09-01 14:14:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better fix #1062 (return error instead of panic)

Browse Source
This commit is contained in:
Mike Farah
2022-01-14 15:40:24 +11:00
parent 78b45a3eb0
commit 606ef91cc6
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/yqlib/write_in_place_handler.go
+6 -5
View File
@@ -6,7 +6,7 @@ import (
type writeInPlaceHandler interface {
CreateTempFile() (*os.File, error)
FinishWriteInPlace(evaluatedSuccessfully bool)
FinishWriteInPlace(evaluatedSuccessfully bool) error
}
type writeInPlaceHandlerImpl struct {
@@ -39,13 +39,14 @@ func (w *writeInPlaceHandlerImpl) CreateTempFile() (*os.File, error) {
return file, err
}
func (w *writeInPlaceHandlerImpl) FinishWriteInPlace(evaluatedSuccessfully bool) {
func (w *writeInPlaceHandlerImpl) FinishWriteInPlace(evaluatedSuccessfully bool) error {
log.Debug("Going to write-inplace, evaluatedSuccessfully=%v, target=%v", evaluatedSuccessfully, w.inputFilename)
safelyCloseFile(w.tempFile)
if evaluatedSuccessfully {
log.Debug("Moving temp file to target")
tryRenameFile(w.tempFile.Name(), w.inputFilename)
} else {
tryRemoveTempFile(w.tempFile.Name())
return tryRenameFile(w.tempFile.Name(), w.inputFilename)
}
tryRemoveTempFile(w.tempFile.Name())
return nil
}