CB-10519 Fixing rebase/merge issues
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/3cef0823 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/3cef0823 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/3cef0823 Branch: refs/heads/common-1.1.x Commit: 3cef0823d7553b4885c12501609a976510f83f96 Parents: 4121b11 Author: Vladimir Kotikov <v-vlk...@microsoft.com> Authored: Fri Feb 19 14:31:30 2016 +0300 Committer: Vladimir Kotikov <v-vlk...@microsoft.com> Committed: Fri Feb 19 14:31:30 2016 +0300 ---------------------------------------------------------------------- cordova-lib/src/cordova/compile.js | 8 ++------ cordova-lib/src/cordova/run.js | 5 ----- 2 files changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3cef0823/cordova-lib/src/cordova/compile.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/compile.js b/cordova-lib/src/cordova/compile.js index e540c14..6a5adfb 100644 --- a/cordova-lib/src/cordova/compile.js +++ b/cordova-lib/src/cordova/compile.js @@ -17,7 +17,8 @@ under the License. */ -var cordova_util = require('./util'), +var Q = require('q'), + cordova_util = require('./util'), HooksRunner = require('../hooks/HooksRunner'), promiseUtil = require('../util/promise-util'), platform_lib = require('../platforms/platforms'); @@ -38,11 +39,6 @@ module.exports = function compile(options) { }); }).then(function() { return hooksRunner.fire('after_compile', options); - }, function(error) { - events.emit('log', 'ERROR building one of the platforms: ' + error + '\nYou may not have the required environment or OS to build this project'); - return Q.reject(error); }); - }).then(function() { - return hooksRunner.fire('after_compile', options); }); }; http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/3cef0823/cordova-lib/src/cordova/run.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/run.js b/cordova-lib/src/cordova/run.js index f2afeed..046b1da 100644 --- a/cordova-lib/src/cordova/run.js +++ b/cordova-lib/src/cordova/run.js @@ -43,11 +43,6 @@ module.exports = function run(options) { })); }).then(function() { return hooksRunner.fire('after_run', options); - }, function(error) { - events.emit('log', 'ERROR running one or more of the platforms: ' + error + '\nYou may not have the required environment or OS to run this project'); - - // CB-10567 bubble up `run` error, so the caller still could get rejected promise - return Q.reject(error); }); }); }; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
