npm: Upgrade to 1.3.14

3 files changed, 23 insertions, 5 deletions

diff --git a/deps/npm/lib/cache.js b/deps/npm/lib/cache.js
index a2f4502c7f..9487534c69 100644
--- a/deps/npm/lib/cache.js
+++ b/deps/npm/lib/cache.js
@@ -712,12 +712,14 @@ function installTargetsError (requested, data) {
   requested = data.name + (requested ? "@'" + requested + "'" : "")
 
   targets = targets.length
-          ? "Valid install targets:\n" + JSON.stringify(targets)
+          ? "Valid install targets:\n" + JSON.stringify(targets) + "\n"
           : "No valid targets found.\n"
           + "Perhaps not compatible with your version of node?"
 
-  return new Error( "No compatible version found: "
+  var er = new Error( "No compatible version found: "
                   + requested + "\n" + targets)
+  er.code = "ETARGET"
+  return er
 }
 
 function addNameVersion (name, v, data, cb) {
diff --git a/deps/npm/lib/config.js b/deps/npm/lib/config.js
index 12879440eb..7d9776379a 100644
--- a/deps/npm/lib/config.js
+++ b/deps/npm/lib/config.js
@@ -83,9 +83,17 @@ function edit (cb) {
                        , ";;;;"
                        ]
                      )
-              .concat(Object.keys(npmconf.defaults).map(function (k) {
-                return "; " + k + " = " + npmconf.defaults[k]
-              }))
+              .concat(Object.keys(npmconf.defaults).reduce(function (arr, key) {
+                var obj = {};
+                obj[key] = npmconf.defaults[key]
+                if (key === "logstream") return arr
+                return arr.concat(
+                  ini.stringify(obj)
+                    .replace(/\n$/m, '')
+                    .replace(/^/g, '; ')
+                    .replace(/\n/g, '\n; ')
+                    .split('\n'))
+              }, []))
               .concat([""])
               .join(os.EOL)
       fs.writeFile
diff --git a/deps/npm/lib/utils/error-handler.js b/deps/npm/lib/utils/error-handler.js
index a4725a31f9..5b33546a76 100644
--- a/deps/npm/lib/utils/error-handler.js
+++ b/deps/npm/lib/utils/error-handler.js
@@ -243,6 +243,14 @@ function errorHandler (er) {
               ].join("\n"))
     break
 
+  case "ETARGET":
+    log.error("notarget", [er.message
+              ,"This is most likely not a problem with npm itself."
+              ,"In most cases you or one of your dependencies are requesting"
+              ,"a package version that doesn't exist."
+              ].join("\n"))
+    break
+
   case "ENOTSUP":
     if (er.required) {
       log.error("notsup", [er.message