opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.5.0 -> release/2.6.0

Browse Source 
* commit 'aa6555c64739abf7e489a68f26665e5659a868bb':
  修正：status检查主体引用错误
This commit is contained in:
邱剑
2019-01-15 11:05:08 +08:00
parent 5fe2b881f0 aa6555c647
commit 74105ea108
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/host_recycle.go
+1 -1
View File
@@ -339,7 +339,7 @@ func (self *SHost) PerformUndoPrepaidRecycle(ctx context.Context, userCred mccli
}
if !guests[0].IsInStatus(VM_READY, VM_RUNNING) {
return nil, httperrors.NewInvalidStatusError("cannot undo recycle in status %s", self.Status)
return nil, httperrors.NewInvalidStatusError("cannot undo recycle in status %s", guests[0].Status)
}
if guests[0].PendingDeleted {