Bugfix: in parallel oao bootstrap, recover original subpackage `pac…

…kage.json` files always, even if one of the subpackages fails to install (#42).
guigrpa · Jun 15, 2017 · c194783 · c194783
1 parent a635351
commit c194783
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Bugfix: in parallel `oao bootstrap`, recover original subpackage `package.json` files always, even if one of the subpackages fails to install (#42).
+
 ## 0.8.3 (Jun. 15, 2017)
 
 * Parallelize `oao bootstrap` -- **substantially improved performance** (#42).

diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -69,7 +69,7 @@ const run = async (opts: Options) => {
     }
   };
   if (opts.parallel) {
-    await runInParallel(pkgNames, installer);
+    await runInParallel(pkgNames, installer, { waitForAllToResolve: true });
   } else {
     await runInSeries(pkgNames, installer);
   }

diff --git a/src/utils/promises.js b/src/utils/promises.js
@@ -6,8 +6,21 @@ const runInSeries = async (items, cb) => {
   return out;
 };
 
-const runInParallel = async (items, cb) =>
-  Promise.all(items.map(cb));
+const runInParallel = async (items, cb, { waitForAllToResolve } = {}) => {
+  const promises = items.map(cb);
+  try {
+    await Promise.all(promises);
+  } catch (err) {
+    if (waitForAllToResolve) {
+      for (let i = 0; i < promises.length; i++) {
+        try {
+          await promises[i];
+        } catch (err2) { /* ignore */ }
+      }
+    }
+    throw err;
+  }
+};
 
 export {
   runInSeries, runInParallel,