From 58a4c5c14d386c862ccf5150b5ab07b57ff2b9b2 Mon Sep 17 00:00:00 2001
From: becker33 <becker33@llnl.gov>
Date: Fri, 27 Jan 2017 11:37:21 -0800
Subject: Fix ambiguous hash message generation. (#2940)

* Fix ambiguous hash message generation. Engineering fix
---
 lib/spack/spack/spec.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index 059653a72a..07e3221ed7 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -2796,7 +2796,7 @@ class SpecParser(spack.parse.Parser):
 
         if len(matches) != 1:
             raise AmbiguousHashError(
-                "Multiple packages specify hash beginning %s."
+                "Multiple packages specify hash beginning '%s'."
                 % self.token.value, *matches)
 
         return matches[0]
@@ -3151,9 +3151,9 @@ class UnsatisfiableDependencySpecError(UnsatisfiableSpecError):
 
 class AmbiguousHashError(SpecError):
     def __init__(self, msg, *specs):
-        super(AmbiguousHashError, self).__init__(msg)
-        for spec in specs:
-            print('    ', spec.format('$.$@$%@+$+$=$#'))
+        specs_str = '\n  ' + '\n  '.join(spec.format('$.$@$%@+$+$=$#')
+                                         for spec in specs)
+        super(AmbiguousHashError, self).__init__(msg + specs_str)
 
 
 class InvalidHashError(SpecError):
-- 
cgit v1.2.3-70-g09d2