Cabin: fix incorrect colorizeAnyhowError (#1137)

cabinpkg · Jan 31, 2025 · 9c0318b · 9c0318b
1 parent fe4a3e1
commit 9c0318b
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/Cabin.cc b/src/Cabin.cc
@@ -67,14 +67,11 @@ getCli() noexcept {
 
 static std::string
 colorizeAnyhowError(std::string s) {
-  if (!shouldColorStderr()) {
-    return s;
-  }
-
   if (s.find("Caused by:") != std::string::npos) {
     replaceAll(s, "Caused by:", Yellow("Caused by:").toErrStr());
-    // `Caused by:` leaves a trailing newline, FIXME: upstream this
-    replaceAll(s, "\n", "");
+  }
+  if (s.back() == '\n') {
+    s.pop_back();  // remove the last '\n' since logger::error adds one.
   }
   return s;
 }