Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-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 7A04D18891 for ; Thu, 26 Nov 2015 15:45:29 +0000 (UTC) Received: (qmail 72375 invoked by uid 500); 26 Nov 2015 15:45:29 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 72327 invoked by uid 500); 26 Nov 2015 15:45:29 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 72318 invoked by uid 99); 26 Nov 2015 15:45:29 -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, 26 Nov 2015 15:45:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 35C9DE0B56; Thu, 26 Nov 2015 15:45:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertkowalski@apache.org To: commits@couchdb.apache.org Message-Id: <960ee4404d684ff09c21bee3b60a8840@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: fauxton commit: updated refs/heads/master to 6d6dbdd Date: Thu, 26 Nov 2015 15:45:29 +0000 (UTC) Repository: couchdb-fauxton Updated Branches: refs/heads/master 8f84268cf -> 6d6dbdd36 build: simplify & fix - remove git checkouts, fauxton never used git checkout and they add complexity - fix async code: an async function call returns undefined, fix done(local && remote) - fix async code: as async callbacks do not return move the done-callback to the point where all async operations are finished to avoid possible race conditions PR: #582 PR-URL: https://github.com/apache/couchdb-fauxton/pull/582 Reviewed-By: Michelle Phung Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/6d6dbdd3 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/6d6dbdd3 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/6d6dbdd3 Branch: refs/heads/master Commit: 6d6dbdd366e1a42b1bd7298baf4ee4dd598dc2fd Parents: 8f84268 Author: Robert Kowalski Authored: Wed Nov 25 16:05:16 2015 +0100 Committer: Robert Kowalski Committed: Thu Nov 26 16:45:25 2015 +0100 ---------------------------------------------------------------------- tasks/fauxton.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6d6dbdd3/tasks/fauxton.js ---------------------------------------------------------------------- diff --git a/tasks/fauxton.js b/tasks/fauxton.js index db1dc89..0ba02d8 100644 --- a/tasks/fauxton.js +++ b/tasks/fauxton.js @@ -49,19 +49,12 @@ module.exports = function (grunt) { }, function (error) { if (error) { grunt.log.writeln('ERROR: ' + error.message); - return false; - } else { - return true; } + + done(); }); }; - var remoteDeps = _.filter(settings.deps, function (dep) { return !! dep.url; }); - grunt.log.writeln(remoteDeps.length + ' remote dependencies'); - var remote = fetch(remoteDeps, function (dep, destination) { - return 'git clone ' + dep.url + ' ' + destination; - }); - var localDeps = _.filter(settings.deps, function (dep) { return !! dep.path; }); grunt.log.writeln(localDeps.length + ' local dependencies'); var local = fetch(localDeps, function (dep, destination) { @@ -70,9 +63,6 @@ module.exports = function (grunt) { grunt.log.writeln(command); return command; }); - - done(remote && local); - }); grunt.registerMultiTask('gen_load_addons', 'Generate the load_addons.js file', function () {