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

Merge pull request #121 from vatesfr/marsaudf-backup-fix

Browse Source 
Fixed rolling tag detection
This commit is contained in:
Olivier Lambert 2015-11-10 16:24:35 +01:00
commit 135799ed5e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xo.js
View File

@ -776,7 +776,7 @@ export default class Xo extends EventEmitter {
await fs.ensureDir(path)
const files = await fs.readdir(path)
const reg = new RegExp('^[^_]+_' + escapeStringRegexp(tag))
const reg = new RegExp('^[^_]+_' + escapeStringRegexp(`${tag}_${vm.name_label}.xva`))
const backups = sortBy(filter(files, (fileName) => reg.test(fileName)))
const date = safeDateFormat(new Date())
@ -798,7 +798,7 @@ export default class Xo extends EventEmitter {
const xapi = this.getXAPI(vm)
vm = xapi.getObject(vm.id)
const reg = new RegExp('^rollingSnapshot_[^_]+_' + escapeStringRegexp(tag))
const reg = new RegExp('^rollingSnapshot_[^_]+_' + escapeStringRegexp(tag) + '_')
const snapshots = sortBy(filter(vm.$snapshots, snapshot => reg.test(snapshot.name_label)), 'name_label')
const date = safeDateFormat(new Date())