From 24e3fc9c3b07c6dc2ceaf282e3b5975491c54d22 Mon Sep 17 00:00:00 2001
From: Liu Ming <hit_oak_tree@126.com>
Date: Thu, 16 Apr 2020 10:11:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'helm/master'

Signed-off-by: Liu Ming <hit_oak_tree@126.com>
Signed-off-by: Matheus Hunsche <matheus.hunsche@ifood.com.br>
---
 pkg/action/rollback.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index e0117293d..81812983f 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -210,8 +210,6 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 		}
 	}
 
-	targetRelease.Info.Status = release.StatusDeployed
-
 	deployed, err := r.cfg.Releases.DeployedAll(currentRelease.Name)
 	if err != nil && !strings.Contains(err.Error(), "has no deployed releases") {
 		return nil, err
@@ -223,5 +221,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 		r.cfg.recordRelease(rel)
 	}
 
+	targetRelease.Info.Status = release.StatusDeployed
+
 	return targetRelease, nil
 }