mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #636 from krasi-georgiev/rename-bug

Browse source 
fileutil.Replace - remove destination only when a directory.
This commit is contained in:
Bartek Płotka 2019-06-24 13:17:41 +01:00 committed by GitHub
parent d501ae4f6e 251c3a4d64
commit b5f9f9f0b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fileutil/fileutil.go
View file

@ -128,9 +128,19 @@ func Rename(from, to string) error {
// Replace moves a file or directory to a new location and deletes any previous data. // Replace moves a file or directory to a new location and deletes any previous data.
// It is not atomic. // It is not atomic.
func Replace(from, to string) error { func Replace(from, to string) error {
// Remove destination only if it is a dir otherwise leave it to os.Rename
// as it replaces the destination file and is atomic.
{
f, err := os.Stat(to)
if !os.IsNotExist(err) {
if err == nil && f.IsDir() {
if err := os.RemoveAll(to); err != nil { if err := os.RemoveAll(to); err != nil {
return err return err
} }
}
}
}
if err := os.Rename(from, to); err != nil { if err := os.Rename(from, to); err != nil {
return err return err
} }