Fix some more errors with duplicate callbacks being called, bower#274.

satazor · satazor · commit d204f7635cde · 2013-03-01T10:48:26.000Z
diff --git a/lib/core/manager.js b/lib/core/manager.js
@@ -132,8 +132,12 @@ Manager.prototype.resolveEndpoints = function () {
     this.dependencies[name] = this.dependencies[name] || [];
     this.dependencies[name].push(pkg);
 
-    pkg.once('resolve', next).resolve();
-    this.gatherPackageErrors(pkg, next);
+    this.gatherPackageErrors(pkg);
+    pkg.once('error', next);
+    pkg.once('resolve', function () {
+      pkg.removeListener('error', next);
+      next();
+    }).resolve();
   }.bind(this), this.emit.bind(this, 'resolveEndpoints'));
 
   return this;
@@ -156,8 +160,12 @@ Manager.prototype.resolveFromJson = function () {
       this.dependencies[name] = this.dependencies[name] || [];
       this.dependencies[name].push(pkg);
 
-      pkg.once('resolve', next).resolve();
-      this.gatherPackageErrors(pkg, next);
+      this.gatherPackageErrors(pkg);
+      pkg.once('error', next);
+      pkg.once('resolve', function () {
+        pkg.removeListener('error', next);
+        next();
+      }).resolve();
     }.bind(this), this.emit.bind(this, 'resolveFromJson'));
   }.bind(this)).loadJSON();
 
@@ -212,9 +220,7 @@ Manager.prototype.prune = function () {
   return true;
 };
 
-Manager.prototype.gatherPackageErrors = function (pkg, next) {
-  var calledNext = false;
-
+Manager.prototype.gatherPackageErrors = function (pkg) {
   // Listen to all the errors
   // The first error will call the next callback and we continue to gather more until the end
   // This makes sense because a package forwards its deep dependencies errors
@@ -227,10 +233,6 @@ Manager.prototype.gatherPackageErrors = function (pkg, next) {
     }
 
     this.errors.push({ pkg: pkg, error: err });
-    if (next && !calledNext) {
-      calledNext = true;
-      next();
-    }
   }.bind(this));
 };
 
