bazel
/
bazel-skylib
mirror of https://github.com/bazelbuild/bazel-skylib
2
0
Fork 0
Code Issues Releases Activity

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.
This commit is contained in:
Julio Merino 2018-10-18 19:04:01 -04:00 committed by Tony Allevato
parent 6e2d7e4a75
commit 8cecf885c8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/versions.bzl
View File

@ -89,10 +89,12 @@ def _check_bazel_version(minimum_bazel_version, maximum_bazel_version = None, ba
""" """
if not bazel_version: if not bazel_version:
if "bazel_version" not in dir(native): 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: elif not native.bazel_version:
print("\nCurrent Bazel is not a release version, cannot check for compatibility.") print("Current 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) "Make sure that you are running at least Bazel {}.".format(minimum_bazel_version))
return return
else: else:
bazel_version = native.bazel_version 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, threshold = minimum_bazel_version,
version = 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, bazel_version,
minimum_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, threshold = maximum_bazel_version,
version = 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, bazel_version,
maximum_bazel_version, maximum_bazel_version,
)) ))