Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DBBBD18118 for ; Thu, 17 Dec 2015 17:59:18 +0000 (UTC) Received: (qmail 37450 invoked by uid 500); 17 Dec 2015 17:59:13 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 37409 invoked by uid 500); 17 Dec 2015 17:59:13 -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 37296 invoked by uid 99); 17 Dec 2015 17:59:13 -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; Thu, 17 Dec 2015 17:59:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9408CE1856; Thu, 17 Dec 2015 17:59:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbarth@apache.org To: commits@cordova.apache.org Date: Thu, 17 Dec 2015 17:59:14 -0000 Message-Id: <5121ee00adf5400085ff70a5f83fa5d9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cordova-ubuntu git commit: Fix nodejs deps install which refers to an invalid ubuntu deps check function Fix nodejs deps install which refers to an invalid ubuntu deps check function github: close #20 (cherry picked from commit 4de08bf483b7bf9f424a2e67477a897485f339ba) Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/f7d74f2a Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/f7d74f2a Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/f7d74f2a Branch: refs/heads/4.3.x Commit: f7d74f2ac796e4dc76241cb97bec0550f58153a0 Parents: cabdd8f Author: Alexandre Abreu Authored: Mon Dec 7 16:30:55 2015 -0500 Committer: David Barth Committed: Thu Dec 17 18:56:49 2015 +0100 ---------------------------------------------------------------------- RELEASENOTES.md | 4 +++- bin/lib/check_reqs.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/f7d74f2a/RELEASENOTES.md ---------------------------------------------------------------------- diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 5565d43..559a55f 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -22,7 +22,9 @@ ### 4.3.2-pre ### -* change click framework to 15.04 by default (14.10 is deprecated) +* CB-10119 - change click framework to 15.04 by default (14.10 is deprecated) +* check_reqs only verifies node dependencies now, not ubuntu build deps which + are checked once trying to build ### 4.3.1 ### http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/f7d74f2a/bin/lib/check_reqs.js ---------------------------------------------------------------------- diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js index 9363057..5e30807 100644 --- a/bin/lib/check_reqs.js +++ b/bin/lib/check_reqs.js @@ -23,7 +23,7 @@ var exec = require('child_process').exec; exports.check_reqs = function (callback) { if (!checkNodeDependencies()) { - installNodeDependencies(checkUbuntuDependencies.bind(null, callback)); + installNodeDependencies(callback); } else { // don't check platform dependencies yet, as they depend on the target // architecture; the base cordova / node / npm install should be --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org