Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/install.js')
-rw-r--r--lib/install.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/install.js b/lib/install.js
index db01693bc..5e199930f 100644
--- a/lib/install.js
+++ b/lib/install.js
@@ -129,6 +129,7 @@ var doSerialActions = require('./install/actions.js').doSerial
var doParallelActions = require('./install/actions.js').doParallel
var doOneAction = require('./install/actions.js').doOne
var parseJSON = require('./utils/parse-json.js')
+var getPackageId = require('./install/get-package-id.js')
function unlockCB (lockPath, name, cb) {
validate('SSF', arguments)
@@ -597,7 +598,7 @@ Installer.prototype.printInstalled = function (cb) {
this.differences.forEach(function (action) {
var mutation = action[0]
var child = action[1]
- var name = child.package.name + '@' + child.package.version
+ var name = getPackageId(child)
var where = path.relative(self.where, child.path)
if (mutation === 'remove') {
console.log('- ' + name + ' ' + where)
@@ -612,7 +613,7 @@ Installer.prototype.printInstalled = function (cb) {
return !child.failed && (mutation === 'add' || mutation === 'update')
}).map(function (action) {
var child = action[1]
- return child.package.name + '@' + child.package.version
+ return getPackageId(child)
})
log.showProgress()
if (!addedOrMoved.length) return cb()
@@ -631,7 +632,7 @@ Installer.prototype.debugActions = function (name, actionListName, cb) {
log.silly(name, 'action count', actionsToLog.length)
actionsToLog.forEach(function (action) {
log.silly(name, action.map(function (value) {
- return (value && value.package) ? value.package.name + '@' + value.package.version : value
+ return (value && value.package) ? getPackageId(value) : value
}).join(' '))
})
cb()
@@ -652,7 +653,7 @@ Installer.prototype.prettify = function (tree) {
}
function expandTree (tree) {
return {
- label: tree.package.name + '@' + tree.package.version,
+ label: getPackageId(tree),
nodes: tree.children.sort(byName).map(expandTree)
}
}