Merge pull request #242 from serokell/phil/fix-rollback-error-message

[Chore] fix error messages claiming to have rolled back when not actually doing so

1 files changed, 3 insertions, 2 deletions

diff --git a/src/cli.rs b/src/cli.rs
index 9140d6d..cc17ea9 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -582,8 +582,8 @@ async fn run_deploy(
             if dry_activate {
                 info!("dry run, not rolling back");
             }
-            info!("Revoking previous deploys");
             if rollback_succeeded && cmd_overrides.auto_rollback.unwrap_or(true) {
+                info!("Revoking previous deploys");
                 // revoking all previous deploys
                 // (adheres to profile configuration if not set explicitely by
                 //  the command line)
@@ -592,8 +592,9 @@ async fn run_deploy(
                         deploy::deploy::revoke(*deploy_data, *deploy_defs).await?;
                     }
                 }
+                return Err(RunDeployError::Rollback);
             }
-            return Err(RunDeployError::Rollback);
+            return Err(RunDeployError::DeployProfile(e))
         }
         succeeded.push((deploy_data, deploy_defs))
     }