Merge branch 'master' of gitlab2.kylin.com:kylinos-src/kylin-backup-tools/kylin-backup-tools
This commit is contained in:
commit
ddb38750f6
|
@ -1,6 +1,7 @@
|
|||
#include "deletebackupproxy.h"
|
||||
#include <QProcess>
|
||||
#include <QDateTime>
|
||||
#include <QRegularExpression>
|
||||
#include <QDebug>
|
||||
#include "../common/utils.h"
|
||||
|
||||
|
@ -51,7 +52,7 @@ bool DeleteBackupProxy::deleteXmlBackupPoint()
|
|||
m_backupPoint = parse.findBackupPointByUuid(m_backupWrapper.m_uuid);
|
||||
|
||||
// 删除节点
|
||||
if (parse.deleteItem(m_backupWrapper.m_uuid) != ParseBackupList::SUCCESS) {
|
||||
if (!m_backupWrapper.m_uuid.contains(QRegularExpression("^\\{.*-.*-.*-.*-.*\\}$")) || parse.deleteItem(m_backupWrapper.m_uuid) != ParseBackupList::SUCCESS) {
|
||||
qCritical() << QString("failed to delete %1 from backuplist.xml!").arg(m_backupWrapper.m_uuid);
|
||||
emit workResult(false);
|
||||
return false;
|
||||
|
|
Loading…
Reference in New Issue