diff --git a/backup-daemon/udiskdatabackupproxy.cpp b/backup-daemon/udiskdatabackupproxy.cpp index 672d02d..fd4aff4 100755 --- a/backup-daemon/udiskdatabackupproxy.cpp +++ b/backup-daemon/udiskdatabackupproxy.cpp @@ -30,8 +30,10 @@ bool UDiskDataBackupProxy::checkEnvEx() qDebug() << "UDiskDataBackupProxy::checkEnv invoke begin"; // 1、检查/backup分区是否挂载上(不管是本地磁盘还是u盘设备,都得保证/backup挂载上); 若没挂载,挂载 + // 后来支持无备份分区 MyMountProxy mountProxy; - if ( MountResult::MOUNTED != mountProxy.mountBackupPartition() ) { + MountResult mountStatus = mountProxy.mountBackupPartition(); + if ( MountResult::MOUNTED != mountStatus && MountResult::CANNOT_GET_BACKUPUUID != mountStatus ) { emit checkResult(int(BackupResult::BACKUP_PARTITION_MOUNT_FAIL)); return false; } diff --git a/backup-daemon/udisksystembackupproxy.cpp b/backup-daemon/udisksystembackupproxy.cpp index 2f7f777..a79e7f8 100755 --- a/backup-daemon/udisksystembackupproxy.cpp +++ b/backup-daemon/udisksystembackupproxy.cpp @@ -50,10 +50,12 @@ bool UDiskSystemBackupProxy::checkEnvEx() qDebug() << "UDiskSystemBackupProxy::checkEnv invoke begin"; // 1、检查/backup分区是否挂载上(不管是本地磁盘还是u盘设备,都得保证/backup挂载上); 若没挂载,挂载 + // 后来支持无备份分区 MyMountProxy mountProxy; - if ( MountResult::MOUNTED != mountProxy.mountBackupPartition() ) { - // emit checkResult(int(BackupResult::BACKUP_PARTITION_MOUNT_FAIL)); - // return false; + MountResult mountStatus = mountProxy.mountBackupPartition(); + if ( MountResult::MOUNTED != mountStatus && MountResult::CANNOT_GET_BACKUPUUID != mountStatus ) { + emit checkResult(int(BackupResult::BACKUP_PARTITION_MOUNT_FAIL)); + return false; } QString backupPath(m_backupWrapper.m_prefixDestPath);