From 44ce0adbd5b0b0356b4fe0977dc627f589278291 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Mon, 31 Jul 2017 17:53:09 -0700 Subject: Fix color bug in Spec.format() introduced by #3013 --- lib/spack/spack/spec.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 71d9f4aac1..54939d7a6b 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -2706,11 +2706,8 @@ class Spec(object): named_str = fmt = '' def write(s, c): - if color: - f = color_formats[c] + cescape(s) + '@.' - cwrite(f, stream=out, color=color) - else: - out.write(s) + f = color_formats[c] + cescape(s) + '@.' + cwrite(f, stream=out, color=color) iterator = enumerate(format_string) for i, c in iterator: @@ -2802,7 +2799,7 @@ class Spec(object): write(fmt % str(self.variants), '+') elif named_str == 'ARCHITECTURE': if self.architecture and str(self.architecture): - write(fmt % str(self.architecture), ' arch=') + write(fmt % str(self.architecture), '=') elif named_str == 'SHA1': if self.dependencies: out.write(fmt % str(self.dag_hash(7))) -- cgit v1.2.3-60-g2f50