NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(S3#_list): handle remote without base directory (#6218)

Browse Source 
Related to zammad#6740
This commit is contained in:
Florent BEAUCHAMP 2022-05-17 10:56:45 +02:00 committed by GitHub
parent 5db4083414
commit 01810f35b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
@xen-orchestra/fs/src/s3.js
View File

@ -97,7 +97,12 @@ export default class S3Handler extends RemoteHandlerAbstract {
} }
_makePrefix(dir) { _makePrefix(dir) {
return join(this._dir, dir, '/') const prefix = join(this._dir, dir, '/')
// no prefix for root
if (prefix !== './') {
return prefix
}
} }
_createParams(file) { _createParams(file) {

2
CHANGELOG.unreleased.md
View File

@ -15,6 +15,8 @@
> Users must be able to say: “I had this issue, happy to know it's fixed” > Users must be able to say: “I had this issue, happy to know it's fixed”
- [S3] Fix S3 remote with empty directory not showing anything to restore (PR [#6218](https://github.com/vatesfr/xen-orchestra/pull/6218))
### Packages to release ### Packages to release
> Packages will be released in the order they are here, therefore, they should > Packages will be released in the order they are here, therefore, they should