Merge branch 'master' into dont-give-away-tracebacks

zalando-stups · May 31, 2016 · d2adca8 · d2adca8
2 parents f10a497 + 608e471
commit d2adca8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/senza/cli.py b/senza/cli.py
@@ -929,7 +929,10 @@ def status(stack_ref, region, output, w, watch):
                         except:
                             answers = []
                         for answer in answers:
-                            if answer.target.to_text().startswith('{}-'.format(stack.StackName)):
+                            target = answer.target.to_text()
+                            if isinstance(target, bytes):
+                                target = target.decode()
+                            if target.startswith('{}-'.format(stack.StackName)):
                                 main_dns_resolves = True
 
             instances = list(ec2.instances.filter(Filters=[{'Name': 'tag:aws:cloudformation:stack-id',