Resolved conflict

cmd/helm/install.go

@@ -267,7 +267,7 @@ func (i *installCmd) run() error {
 		return fmt.Errorf("cannot load requirements: %v", err)
 	}
 
-	res, err := i.client.InstallReleaseFromChart(
+	resp, err := i.client.InstallReleaseFromChart(
 		chartRequested,
 		i.namespace,
 		helm.ValueOverrides(rawVals),
@@ -298,12 +298,6 @@ func (i *installCmd) run() error {
 		return prettyError(err)
 	}
 
-	rel := res.GetRelease()
-	if rel == nil {
-		return nil
-	}
-	i.printRelease(rel)
-
 	// If this is a dry run, we can't display status.
 	if i.dryRun {
 		// This is special casing to avoid breaking backward compatibility:
@@ -314,7 +308,7 @@ func (i *installCmd) run() error {
 	}
 
 	// Print the status like status command does
-	status, err := i.client.ReleaseStatus(rel.Name)
+	status, err := i.client.ReleaseStatus(i.name)
 	if err != nil {
 		return prettyError(err)
 	}

cmd/helm/rollback.go

@@ -88,7 +88,7 @@ func newRollbackCmd(c helm.Interface, out io.Writer) *cobra.Command {
 }
 
 func (r *rollbackCmd) run() error {
-	_, err := r.client.RollbackRelease(
+	resp, err := r.client.RollbackRelease(
 		r.name,
 		helm.RollbackDryRun(r.dryRun),
 		helm.RollbackRecreate(r.recreate),
@@ -97,6 +97,24 @@ func (r *rollbackCmd) run() error {
 		helm.RollbackVersion(r.revision),
 		helm.RollbackTimeout(r.timeout),
 		helm.RollbackWait(r.wait))
+
+	if settings.Debug {
+		// If there is an error while waiting, make a call without waiting to get the release content
+		if (resp == nil || resp.Release == nil) && r.wait {
+			if res, e := r.client.ReleaseContent(r.name); e != nil {
+				fmt.Fprintf(r.out, "Error reading release content: %v", prettyError(e))
+			} else {
+				printRelease(r.out, res.Release)
+			}
+		} else {
+			rel := resp.GetRelease()
+			if rel == nil {
+				return nil
+			}
+			printRelease(r.out, rel)
+		}
+	}
+
 	if err != nil {
 		return prettyError(err)
 	}