From: Gunnar Beutner <gunnar@beutner.name>
Date: Mon, 9 Feb 2015 14:15:26 +0000 (+0100)
Subject: console: Don't repeat line when we're reporting an error for the last line
X-Git-Tag: v2.3.0~254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=438e6dcd0979157f154b685430d0123615478c20;p=icinga2

console: Don't repeat line when we're reporting an error for the last line

fixes #8099
---

diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp
index 8161ffc62..3f37dae7a 100644
--- a/lib/cli/consolecommand.cpp
+++ b/lib/cli/consolecommand.cpp
@@ -110,8 +110,15 @@ int ConsoleCommand::Run(const po::variables_map& vm, const std::vector<std::stri
 				DebugInfo di = ex.GetDebugInfo();
 
 				if (lines.find(di.Path) != lines.end()) {
-					std::cout << di.Path << ": " << lines[di.Path] << "\n";
-					std::cout << String(di.Path.GetLength() + 2, ' ');
+					int offset;
+
+					if (di.Path != fileName) {
+						std::cout << di.Path << ": " << lines[di.Path] << "\n";
+						offset = 2;
+					} else
+						offset = 4;
+
+					std::cout << String(di.Path.GetLength() + offset, ' ');
 					std::cout << String(di.FirstColumn, ' ') << String(di.LastColumn - di.FirstColumn + 1, '^') << "\n";
 				} else {
 					ShowCodeFragment(std::cout, di);