From a8675cfe1a8622d3f23944c2a0635015fd7743b3 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Thu, 30 Aug 2018 10:22:51 -0700 Subject: [PATCH] don't fail if /etc/issue is not present Summary: When running on macOS there is no /etc/issue. When running with `set -e` enabled, we don't want this to break the build. Neither of these is possible today, but will be later in this diff stack. While I'm in here, also print out the cmake version. Refs: https://github.com/facebook/watchman/pull/639 Reviewed By: snarkmaster Differential Revision: D9552416 fbshipit-source-id: 432b5b70678908de9f79787d37c3615a7f8649d3 --- build/fbcode_builder/fbcode_builder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/fbcode_builder.py b/build/fbcode_builder/fbcode_builder.py index 0580d4305..ccc4e3d8f 100644 --- a/build/fbcode_builder/fbcode_builder.py +++ b/build/fbcode_builder/fbcode_builder.py @@ -154,8 +154,9 @@ class FBCodeBuilder(object): return self.step('Diagnostics', [ self.comment('Builder {0}'.format(repr(self))), self.run(ShellQuoted('hostname')), - self.run(ShellQuoted('cat /etc/issue')), + self.run(ShellQuoted('cat /etc/issue || echo no /etc/issue')), self.run(ShellQuoted('g++ --version || echo g++ not installed')), + self.run(ShellQuoted('cmake --version || echo cmake not installed')), ]) def step(self, name, actions):