From b217430b13678ea14db7b37aea4fc8e77b7518d9 Mon Sep 17 00:00:00 2001 From: Ivan Dubrov Date: Wed, 8 Jul 2015 12:57:14 -0700 Subject: [PATCH] Fixing Mercurial MQ extension check --- build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 3bbdb30c..de9ebce7 100644 --- a/build.gradle +++ b/build.gradle @@ -36,19 +36,19 @@ project('hotspot') { task checkMercurial(description: 'Verify Mercurial is installed') << { def os = new ByteArrayOutputStream() try { - exec { + def result = exec { executable 'hg' - args 'help', 'init' + args 'help', 'qinit' standardOutput = os errorOutput = os + ignoreExitValue = true + } + if (result.getExitValue() != 0) { + throw new GradleException("Mercurial does not have mq extension installed! Consult README.md for details.") } } catch (GradleException e) { throw new GradleException("Failed to execute 'hg'. Make sure you have Mercurial installed!") } - def str = os.toString() - if (!str.contains('--mq')) { - throw new GradleException("Mercurial does not have mq extension installed! Consult README.md for details.") - } } task init(description: 'Initialize HotSpot repository', dependsOn: checkMercurial) << { -- 2.39.5