Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 35F5A200C6A for ; Wed, 19 Apr 2017 21:08:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 34852160B9C; Wed, 19 Apr 2017 19:08:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7CA6D160B94 for ; Wed, 19 Apr 2017 21:08:29 +0200 (CEST) Received: (qmail 59185 invoked by uid 500); 19 Apr 2017 19:08:28 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 59176 invoked by uid 99); 19 Apr 2017 19:08:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Apr 2017 19:08:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E9C48E04F2; Wed, 19 Apr 2017 19:08:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cordova-lib git commit: CB-11777: Restore plugins before preparing Date: Wed, 19 Apr 2017 19:08:27 +0000 (UTC) archived-at: Wed, 19 Apr 2017 19:08:30 -0000 Repository: cordova-lib Updated Branches: refs/heads/master 6f0a5611a -> 036904536 CB-11777: Restore plugins before preparing This closes #487 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/03690453 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/03690453 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/03690453 Branch: refs/heads/master Commit: 036904536ca71189e1bd0d8c424f87c9f0a41cc4 Parents: 6f0a561 Author: Darryl Pogue Authored: Fri Aug 26 15:10:52 2016 -0700 Committer: Steve Gill Committed: Wed Apr 19 12:03:08 2017 -0700 ---------------------------------------------------------------------- cordova-lib/src/cordova/prepare.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/03690453/cordova-lib/src/cordova/prepare.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js index 9a5cdab..729813d 100644 --- a/cordova-lib/src/cordova/prepare.js +++ b/cordova-lib/src/cordova/prepare.js @@ -53,6 +53,9 @@ function prepare(options) { return platforms.getPlatformApi(p, platform_path).getPlatformInfo().locations.www; }); options.paths = paths; + }).then(function () { + options = cordova_util.preProcessOptions(options); + return restore.installPluginsFromConfigXML(options); }).then(function() { options = cordova_util.preProcessOptions(options); options.searchpath = options.searchpath || config_json.plugin_search_path; @@ -63,8 +66,6 @@ function prepare(options) { return platforms.getPlatformApi(platform).getPlatformInfo().locations.www; }); return hooksRunner.fire('after_prepare', options); - }).then(function () { - return restore.installPluginsFromConfigXML(options); }); }); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org