suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-09-05 09:04:58 +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/file_utils.go
+4 -4
View File
@@ -7,7 +7,7 @@ import (
"os"
)
func tryRenameFile(from string, to string) {
func tryRenameFile(from string, to string) error {
if renameError := os.Rename(from, to); renameError != nil {
log.Debugf("Error renaming from %v to %v, attempting to copy contents", from, to)
log.Debug(renameError.Error())
@@ -15,11 +15,11 @@ func tryRenameFile(from string, to string) {
// can't do this rename when running in docker to a file targeted in a mounted volume,
// so gracefully degrade to copying the entire contents.
if copyError := copyFileContents(from, to); copyError != nil {
panic(fmt.Errorf("failed copying from %v to %v: %w", from, to, copyError))
} else {
tryRemoveTempFile(from)
return fmt.Errorf("failed copying from %v to %v: %w", from, to, copyError)
}
tryRemoveTempFile(from)
}
return nil
}
func tryRemoveTempFile(filename string) {