From b05cd3557731f5ffac0e00d0ee0c08bb413365e0 Mon Sep 17 00:00:00 2001
From: Martijn Walraven <martijn@martijnwalraven.com>
Date: Wed, 13 Jan 2016 11:51:31 +0100
Subject: [PATCH] Abort followup tasks if Cordova project creation doesn't
 succeed

---
 tools/cli/commands-cordova.js | 2 ++
 tools/cli/commands.js         | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/tools/cli/commands-cordova.js b/tools/cli/commands-cordova.js
index 440533bc50..813eebed68 100644
--- a/tools/cli/commands-cordova.js
+++ b/tools/cli/commands-cordova.js
@@ -53,6 +53,7 @@ main.registerCommand({
     }
 
     const cordovaProject = new CordovaProject(projectContext);
+    if (buildmessage.jobHasMessages()) return;
 
     installedPlatforms = installedPlatforms.concat(platformsToAdd)
     const cordovaPlatforms = cordova.filterPlatforms(installedPlatforms);
@@ -109,6 +110,7 @@ version of Meteor`);
 
     if (process.platform !== 'win32') {
       const cordovaProject = new CordovaProject(projectContext);
+      if (buildmessage.jobHasMessages()) return;
       const cordovaPlatforms = cordova.filterPlatforms(installedPlatforms);
       cordovaProject.ensurePlatformsAreSynchronized(cordovaPlatforms);
     }
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 76a8817531..04a4d3b555 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -348,6 +348,7 @@ function doRunCommand(options) {
       const cordovaProject = new CordovaProject(projectContext, {
         settingsFile: options.settings,
         mobileServerUrl: utils.formatUrl(parsedMobileServerUrl) });
+      if (buildmessage.jobHasMessages()) return;
 
       cordovaRunner = new CordovaRunner(cordovaProject, runTargets);
       cordovaRunner.checkPlatformsForRunTargets();
@@ -964,6 +965,7 @@ on an OS X system.");
         cordovaProject = new CordovaProject(projectContext, {
           settingsFile: options.settings,
           mobileServerUrl: utils.formatUrl(parsedMobileServerUrl) });
+        if (buildmessage.jobHasMessages()) return;
 
         const plugins = cordova.pluginVersionsFromStarManifest(
           bundleResult.starManifest);
@@ -1580,6 +1582,7 @@ main.registerCommand({
       const cordovaProject = new CordovaProject(projectContext, {
         settingsFile: options.settings,
         mobileServerUrl: utils.formatUrl(parsedMobileServerUrl) });
+      if (buildmessage.jobHasMessages()) return;
 
       cordovaRunner = new CordovaRunner(cordovaProject, runTargets);
       projectContext.platformList.write(cordovaRunner.platformsForRunTargets);