Merge branch 'master' into friendly-failures

CHANGELOG.md

+## v73 (24/4/2015)
+
+- Patch for caching to disable cache restoration if node_modules already exists (eg from being git submoduled or checked into git)
+
 ## v72 (23/4/2015)
 
 * Accepts `cacheDirectories` array in package.json to override default `node_modules` caching

lib/build.sh

@@ -170,7 +170,6 @@ install_npm() {
 }
 
 function build_dependencies() {
-  restore_cache
 
   if [ "$modules_source" == "" ]; then
     info "Skipping dependencies (no source for node_modules)"
@@ -182,6 +181,7 @@ function build_dependencies() {
     npm install --unsafe-perm --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
 
   else
+    restore_cache
     info "Installing node modules"
     npm install --unsafe-perm --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
   fi

test/run

@@ -218,7 +218,11 @@ testBuildWithUserCacheDirectoriesCamel() {
 }
 
 testModulesCheckedIn() {
-  compile "modules-checked-in"
+  cache=$(mktmpdir)
+  compile "modules-checked-in" $cache
+  assertCapturedSuccess
+
+  compile "modules-checked-in" $cache
   assertCaptured "node_modules source: prebuilt"
   assertCaptured "Rebuilding any native modules for this architecture"
   assertCaptured "(preinstall script)"