From e88e4a2837f8be0daea4544cbe21b6c909353bee Mon Sep 17 00:00:00 2001
From: Martijn Walraven <martijn@martijnwalraven.com>
Date: Fri, 24 Jul 2015 14:04:48 -0700
Subject: [PATCH] Add explicit dependency on the npm version we build our node
 fork with

---
 scripts/dev-bundle-tool-package.js | 3 +++
 scripts/generate-dev-bundle.sh     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 7531621a34..a875a04406 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -20,6 +20,9 @@ var packageJson = {
   // Version is not important but is needed to prevent warnings.
   version: "0.0.0",
   dependencies: {
+    // Explicit dependency because we are replacing it with a bundled version
+    // and we want to make sure there are no dependencies on a higher version
+    npm: "1.4.28",
     fibers: fibersVersion,
     "meteor-babel": "0.4.4",
     "meteor-promise": "0.4.0",
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 28b33d07be..c6ef8e81da 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -176,7 +176,7 @@ rm -rf "$DIR/bin/npm3"
 # Sanity check to see if we're not breaking anything by replacing npm
 INSTALLED_NPM_VERSION=$(cat "$DIR/lib/node_modules/npm/package.json" |
 xargs -0 node -e "console.log(JSON.parse(process.argv[1]).version)")
-if [ "$INSTALLED_NPM_VERSION" != "1.3.4" ]; then
+if [ "$INSTALLED_NPM_VERSION" != "1.4.28" ]; then
   echo "Unexpected NPM version in lib/node_modules: $INSTALLED_NPM_VERSION"
   echo "We will be replacing it with our own version because the bundled node"
   echo "is built using PORTABLE=1, which makes npm look for node relative to"