fix(fs/SMB): rename should replace existing files (#3278)

Fixes #3224
This commit is contained in:
Julien Fontanet
2018-08-08 10:32:08 +02:00
committed by GitHub
parent a7dd83772e
commit cc90d41be4
4 changed files with 9 additions and 5 deletions

View File

@@ -21,7 +21,7 @@
},
"dependencies": {
"@babel/runtime": "7.0.0-beta.54",
"@marsaud/smb2": "^0.8.0",
"@marsaud/smb2": "^0.9.0",
"execa": "^0.10.0",
"fs-extra": "^7.0.0",
"get-stream": "^3.0.0",

View File

@@ -139,7 +139,9 @@ export default class SmbHandler extends RemoteHandlerAbstract {
try {
await client
.rename(this._getFilePath(oldPath), this._getFilePath(newPath))
.rename(this._getFilePath(oldPath), this._getFilePath(newPath), {
replace: true,
})
::pFinally(() => {
client.disconnect()
})

View File

@@ -15,9 +15,11 @@
### Bug fixes
- [Pools] Filter GPU groups by pool [#3176](https://github.com/vatesfr/xen-orchestra/issues/3176) (PR [#3253](https://github.com/vatesfr/xen-orchestra/pull/3253))
- [Backup NG] Fix delta backups with SMB remotes [#3224](https://github.com/vatesfr/xen-orchestra/issues/3224) (PR [#3278](https://github.com/vatesfr/xen-orchestra/pull/3278))
### Released packages
- @xen-orchestra/fs 0.2.1
- xo-server v5.24.0
- xo-web v5.24.0

View File

@@ -764,9 +764,9 @@
version "0.3.0"
resolved "https://registry.yarnpkg.com/@julien-f/freactal/-/freactal-0.3.0.tgz#f730f216f1db085b2d69ae5e678570d4ed0a82ca"
"@marsaud/smb2@^0.8.0":
version "0.8.0"
resolved "https://registry.yarnpkg.com/@marsaud/smb2/-/smb2-0.8.0.tgz#d602ba918b01c1b5c2edc6f19b6708f7776b14ac"
"@marsaud/smb2@^0.9.0":
version "0.9.0"
resolved "https://registry.yarnpkg.com/@marsaud/smb2/-/smb2-0.9.0.tgz#e63df305ce73a7672492100c29b6ebe203bf3550"
dependencies:
babel-runtime "^5.8.34"
bluebird "^2.10.2"