diff options
| author | isaacs <i@izs.me> | 2011-11-22 16:56:59 -0800 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2011-11-22 17:03:58 -0800 |
| commit | 3ab15cde2516564a2bc4fe6246fe447f07752ed4 (patch) | |
| tree | e858b4c4617fe2f9d1b69e7b2186f6b0674ec93b /deps/npm/lib | |
| parent | 0ba78d5f36256dacf625e96dc40e4e34bacfdd35 (diff) | |
| download | node-3ab15cde2516564a2bc4fe6246fe447f07752ed4.tar.gz | |
Update npm to 1.1.0-alpha-2
Diffstat (limited to 'deps/npm/lib')
| -rw-r--r-- | deps/npm/lib/completion.js | 2 | ||||
| -rw-r--r-- | deps/npm/lib/utils/tar.js | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/deps/npm/lib/completion.js b/deps/npm/lib/completion.js index bc97bf1af..ebee00387 100644 --- a/deps/npm/lib/completion.js +++ b/deps/npm/lib/completion.js @@ -20,7 +20,7 @@ var output = require("./utils/output.js") completion.completion = function (opts, cb) { if (opts.w > 3) return cb() - var fs = require("fs") + var fs = require("graceful-fs") , path = require("path") , bashExists = null , zshExists = null diff --git a/deps/npm/lib/utils/tar.js b/deps/npm/lib/utils/tar.js index d6db6ea52..9d5f05210 100644 --- a/deps/npm/lib/utils/tar.js +++ b/deps/npm/lib/utils/tar.js @@ -76,16 +76,10 @@ function packFiles (targetTarball, parent, files, pkg, cb) { , path: parent , filter: function () { return -1 !== files.indexOf(this.path) - // || (this.type === "Directory" && - // this.basename !== ".git") - } }) .on("error", log.er(cb, "error reading "+parent)) - .on("entry", function E (entry) { - entry.on("entry", E) - }) - .pipe(tar.Pack({})) + .pipe(tar.Pack()) .on("error", log.er(cb, "tar creation error "+targetTarball)) .pipe(zlib.Gzip()) .on("error", log.er(cb, "gzip error "+targetTarball)) @@ -155,8 +149,9 @@ function gunzTarPerm (tarball, tmp, dMode, fMode, uid, gid, cb) { log.silly([dMode.toString(8), fMode.toString(8)], "gunzTarPerm modes") fs.createReadStream(tarball) + .on("error", log.er(cb, "error reading "+tarball)) .pipe(zlib.Unzip()) - .on("error", log.er(cb, "unzip error")) + .on("error", log.er(cb, "unzip error "+tarball)) .pipe(tar.Extract({ type: "Directory", path: tmp })) .on("error", log.er(cb, "Failed unpacking "+tarball)) .on("close", afterUntar) @@ -165,6 +160,7 @@ function gunzTarPerm (tarball, tmp, dMode, fMode, uid, gid, cb) { // XXX Do all this in an Extract filter. // function afterUntar (er) { + log.silly(er, "afterUntar") // if we're not doing ownership management, // then we're done now. if (er) return log.er(cb, "Failed unpacking "+tarball)(er) |