From 8cecf885c8bf4c51e82fd6b50b9dd68d2c98f757 Mon Sep 17 00:00:00 2001
From: Julio Merino <julio@meroh.net>
Date: Thu, 18 Oct 2018 19:04:01 -0400
Subject: [PATCH] Remove spurious newlines from fail/print messages (#60)

The fail() and print() primitives take strings without newlines in them
because the formatted output will already contain newlines.  Therefore,
remove them, which have been annoying me to no end when using rules_go
with a HEAD-built Bazel binary.

While doing this, also switch to using .format() consistently for all
strings, merge two related debug messages into the same print() call,
and fix grammar.
---
 lib/versions.bzl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/versions.bzl b/lib/versions.bzl
index 0298ef4..f5a3066 100644
--- a/lib/versions.bzl
+++ b/lib/versions.bzl
@@ -89,10 +89,12 @@ def _check_bazel_version(minimum_bazel_version, maximum_bazel_version = None, ba
     """
     if not bazel_version:
         if "bazel_version" not in dir(native):
-            fail("\nCurrent Bazel version is lower than 0.2.1, expected at least %s\n" % minimum_bazel_version)
+            fail("Current Bazel version is lower than 0.2.1; expected at least {}".format(
+                minimum_bazel_version,
+            ))
         elif not native.bazel_version:
-            print("\nCurrent Bazel is not a release version, cannot check for compatibility.")
-            print("Make sure that you are running at least Bazel %s.\n" % minimum_bazel_version)
+            print("Current Bazel is not a release version; cannot check for compatibility. " +
+                  "Make sure that you are running at least Bazel {}.".format(minimum_bazel_version))
             return
         else:
             bazel_version = native.bazel_version
@@ -101,7 +103,7 @@ def _check_bazel_version(minimum_bazel_version, maximum_bazel_version = None, ba
         threshold = minimum_bazel_version,
         version = bazel_version,
     ):
-        fail("\nCurrent Bazel version is {}, expected at least {}\n".format(
+        fail("Current Bazel version is {}; expected at least {}".format(
             bazel_version,
             minimum_bazel_version,
         ))
@@ -111,7 +113,7 @@ def _check_bazel_version(minimum_bazel_version, maximum_bazel_version = None, ba
             threshold = maximum_bazel_version,
             version = bazel_version,
         ):
-            fail("\nCurrent Bazel version is {}, expected at most {}\n".format(
+            fail("Current Bazel version is {}; expected at most {}".format(
                 bazel_version,
                 maximum_bazel_version,
             ))