From db0edaafe15831ba6fa9c2109da37942506c62b1 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 23 Jan 2016 11:14:05 +0200
Subject: Cleanup absolute/relative path diagnostics by introducing stream
 verbosity

---
 build2/spec.cxx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'build2/spec.cxx')

diff --git a/build2/spec.cxx b/build2/spec.cxx
index 89ed9c8..3f02d87 100644
--- a/build2/spec.cxx
+++ b/build2/spec.cxx
@@ -18,10 +18,18 @@ namespace build2
   {
     if (!s.src_base.empty ())
     {
-      string d (diag_relative (s.src_base, false));
-
-      if (!d.empty ())
-        os << d << '@';
+      // Avoid printing './' in './@...', similar to what we do for the
+      // {target,prerequisite}_key.
+      //
+      if (stream_verb (os) < 2)
+      {
+        const string& r (diag_relative (s.src_base, false));
+
+        if (!r.empty ())
+          os << r << '@';
+      }
+      else
+        os << s.src_base << '@';
     }
 
     os << s.name;
-- 
cgit v1.1