You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2015/11/26 16:45:29 UTC

fauxton commit: updated refs/heads/master to 6d6dbdd

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 <mi...@apache.org>


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 <ro...@apache.org>
Authored: Wed Nov 25 16:05:16 2015 +0100
Committer: Robert Kowalski <ro...@apache.org>
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 () {