Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore error on os.Chtimes in config archiving

This commit is contained in:
Jakob Borg 2015-12-26 18:25:07 +01:00
parent f36f48c2cf
commit 2fae7ccf5c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/syncthing/main.go
View File

@ -936,15 +936,11 @@ func loadOrCreateConfig() *config.Wrapper {
func archiveAndSaveConfig(cfg *config.Wrapper) error {
// To prevent previous config from being cleaned up, quickly touch it too
now := time.Now()
err := os.Chtimes(cfg.ConfigPath(), now, now)
if err != nil {
return err
}
_ = os.Chtimes(cfg.ConfigPath(), now, now) // May return error on Android etc; no worries
archivePath := cfg.ConfigPath() + fmt.Sprintf(".v%d", cfg.Raw().OriginalVersion)
l.Infoln("Archiving a copy of old config file format at:", archivePath)
err = osutil.Rename(cfg.ConfigPath(), archivePath)
if err != nil {
if err := osutil.Rename(cfg.ConfigPath(), archivePath); err != nil {
return err
}