github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

chore(fs): change to a more meaningful function name

pull/10728/head
oscarzhou 2023-12-04 22:29:18 +13:00
parent b93bcd28bd
commit 6739cb427f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/filesystem/filesystem.go
View File

@ -938,7 +938,7 @@ func (service *Service) SafeMoveDirectory(originalPath, newPath string) error {
func safeMoveDirectory(src, dst string, copyDirFunc func(string, string, bool) error) error { func safeMoveDirectory(src, dst string, copyDirFunc func(string, string, bool) error) error {
// 1. Backup the source directory to a different folder // 1. Backup the source directory to a different folder
backupDir := fmt.Sprintf("%s-%s", src, "backup") backupDir := fmt.Sprintf("%s-%s", src, "backup")
err := moveDirectoryForUpgrade(src, backupDir) err := moveDirectoryAndOverwrite(src, backupDir)
if err != nil { if err != nil {
return fmt.Errorf("failed to backup source directory: %w", err) return fmt.Errorf("failed to backup source directory: %w", err)
} }
@ -1001,7 +1001,7 @@ func MoveDirectory(originalPath, newPath string) error {
return os.Rename(originalPath, newPath) return os.Rename(originalPath, newPath)
} }
func moveDirectoryForUpgrade(originalPath, newPath string) error { func moveDirectoryAndOverwrite(originalPath, newPath string) error {
if _, err := os.Stat(originalPath); err != nil { if _, err := os.Stat(originalPath); err != nil {
return err return err
} }