From de2f6c219f1a7c5f4879200fb8bbbb4cc39652ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Sat, 5 Jan 2019 18:26:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=88=A0=E9=99=A4=E9=9D=9E?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=8A=B6=E6=80=81=E4=B8=8Bimage=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E6=81=A2=E5=A4=8D=E6=97=B6,=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=97=B6=E4=BC=9A=E5=87=BA=E7=8E=B0=E9=9D=9E?= =?UTF-8?q?=E9=A2=84=E6=9C=9F=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/image/models/images.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/image/models/images.go b/pkg/image/models/images.go index aef62d2c25..3b70404245 100644 --- a/pkg/image/models/images.go +++ b/pkg/image/models/images.go @@ -533,6 +533,9 @@ func (self *SImage) CustomizeDelete(ctx context.Context, userCred mcclient.Token overridePendingDelete = jsonutils.QueryBoolean(query, "override_pending_delete", false) purge = jsonutils.QueryBoolean(query, "purge", false) } + if self.Status != IMAGE_STATUS_ACTIVE { + overridePendingDelete = true + } return self.startDeleteImageTask(ctx, userCred, "", purge, overridePendingDelete) }