diff options
| author | Rebecca Turner <me@re-becca.org> | 2015-10-29 16:50:12 -0700 |
|---|---|---|
| committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2015-11-02 14:25:04 -0500 |
| commit | 507fc53e37d3fc6abb5ce0f7c46c8d7479e647ab (patch) | |
| tree | 68ea2bbf0733eb1a1977b899040e18d035737a51 /deps/npm/lib/ls.js | |
| parent | 6e40bf065931e20737875b27ab9ee71eaf5c7f99 (diff) | |
| download | android-node-v8-507fc53e37d3fc6abb5ce0f7c46c8d7479e647ab.tar.gz android-node-v8-507fc53e37d3fc6abb5ce0f7c46c8d7479e647ab.tar.bz2 android-node-v8-507fc53e37d3fc6abb5ce0f7c46c8d7479e647ab.zip | |
deps: upgrade npm to 3.3.10
PR-URL: https://github.com/nodejs/node/pull/3599
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/lib/ls.js')
| -rw-r--r-- | deps/npm/lib/ls.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/deps/npm/lib/ls.js b/deps/npm/lib/ls.js index 1854938eb6..51f0b51550 100644 --- a/deps/npm/lib/ls.js +++ b/deps/npm/lib/ls.js @@ -18,7 +18,7 @@ var iferr = require('iferr') var npm = require('./npm.js') var mutateIntoLogicalTree = require('./install/mutate-into-logical-tree.js') var recalculateMetadata = require('./install/deps.js').recalculateMetadata -var getPackageId = require('./install/get-package-id.js') +var packageId = require('./utils/package-id.js') ls.usage = 'npm ls [[<@scope>/]<pkg> ...]' + '\n\naliases: list, la, ll' @@ -151,7 +151,7 @@ function getLite (data, noname) { if (data.extraneous) { lite.extraneous = true lite.problems = lite.problems || [] - lite.problems.push('extraneous: ' + getPackageId(data) + ' ' + (data.path || '')) + lite.problems.push('extraneous: ' + packageId(data) + ' ' + (data.path || '')) } if (data.error && data.path !== path.resolve(npm.globalDir, '..') && @@ -174,7 +174,7 @@ function getLite (data, noname) { lite.invalid = true lite.problems = lite.problems || [] lite.problems.push('invalid: ' + - getPackageId(data) + + packageId(data) + ' ' + (data.path || '')) } @@ -182,7 +182,7 @@ function getLite (data, noname) { lite.peerInvalid = true lite.problems = lite.problems || [] lite.problems.push('peer dep not met: ' + - getPackageId(data) + + packageId(data) + ' ' + (data.path || '')) } @@ -200,7 +200,7 @@ function getLite (data, noname) { } p += d + '@' + dep.requiredBy + ', required by ' + - getPackageId(data) + packageId(data) lite.problems.push(p) return [d, { required: dep.requiredBy, missing: true }] } else if (dep.peerMissing) { |