You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/12/05 21:42:12 UTC
git commit: Make sure errors during prepare are reported
Updated Branches:
refs/heads/master 68942e6c8 -> ed82c5a9a
Make sure errors during prepare are reported
>From https://github.com/apache/cordova-cli/pull/49
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/ed82c5a9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/ed82c5a9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/ed82c5a9
Branch: refs/heads/master
Commit: ed82c5a9a9419288ed842c8872a7ffba4b966720
Parents: 68942e6
Author: Anton Keks <an...@codeborne.com>
Authored: Thu Dec 5 15:41:30 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Dec 5 15:41:30 2013 -0500
----------------------------------------------------------------------
src/metadata/android_parser.js | 4 ++--
src/prepare.js | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ed82c5a9/src/metadata/android_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/android_parser.js b/src/metadata/android_parser.js
index 5878678..ca8a652 100644
--- a/src/metadata/android_parser.js
+++ b/src/metadata/android_parser.js
@@ -152,11 +152,11 @@ module.exports.prototype = {
var platformWww = path.join(this.path, 'assets');
try {
this.update_from_config(cfg);
+ this.update_overrides();
+ this.update_staging();
} catch(e) {
return Q.reject(e);
}
- this.update_overrides();
- this.update_staging();
// delete any .svn folders copied over
util.deleteSvnFolders(platformWww);
return Q();
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ed82c5a9/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 9e7719e..92b828d 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -120,6 +120,8 @@ module.exports = function prepare(options) {
platform_cfg.merge_with(cfg, platform, true);
return parser.update_project(cfg);
+ }).fail(function(e) {
+ console.error(e);
});
})).then(function() {
return hooks.fire('after_prepare', options);