MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pterodactyl:develop' into nwy-wings

Browse Source
This commit is contained in:
Ethan Alicea
2023-10-27 09:23:08 -04:00
committed by GitHub
parent b6b8b67168 d30ab7b9bd
commit 175ff31793
4 changed files with 4 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/backup/backup_local.go
View File

@@ -100,7 +100,7 @@ func (b *LocalBackup) Restore(ctx context.Context, _ io.Reader, callback Restore
}
defer r.Close()
return callback(filesystem.ExtractNameFromArchive(f), f.FileInfo, r)
return callback(f.NameInArchive, f.FileInfo, r)
}); err != nil {
return err
}

2
server/backup/backup_s3.go
View File

@@ -100,7 +100,7 @@ func (s *S3Backup) Restore(ctx context.Context, r io.Reader, callback RestoreCal
}
defer r.Close()
return callback(filesystem.ExtractNameFromArchive(f), f.FileInfo, r)
return callback(f.NameInArchive, f.FileInfo, r)
}); err != nil {
return err
}