Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

wip-ish, just saving the branch. this will have to be redone

  • Loading branch information...
commit 3a804d4c7acb9de961a43f5838c9b0a0fdc00db8 1 parent 4e5fdee
@isaacs isaacs authored
View
9 lib/install.js
@@ -299,7 +299,7 @@ function readDependencies (context, where, opts, cb) {
}
function distSum (w) {
- return w.dist && w.dist.shasum
+ return w.dist && w.dist.shasum || w.shasum
}
function readWrap (w) {
@@ -656,6 +656,7 @@ function targetResolver (where, context, deps) {
return cb(null, [])
}
+ var name
if (wrap) {
name = what.split(/@/).shift()
if (wrap[name]) {
@@ -680,11 +681,11 @@ function targetResolver (where, context, deps) {
return cb(null, [])
}
- if (parent && parent.shasums && parent.shasums[what]) {
- var want = parent.shasums[what]
+ if (parent && parent.shasums && parent.shasums[name]) {
+ var want = parent.shasums[name]
var got = data.dist.shasum
if (want !== got) {
- var er = new Error( "shasum changed: " + what + "\n"
+ var er = new Error( "shasum changed: " + name + "\n"
+ "wanted: " + want + "\n"
+ "actual: " + got)
if (npm.config.get("force")) {
View
6 test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json
@@ -6,11 +6,11 @@
"version": "1.2.3",
"from": "https://raw.github.com/gist/1837112/index.js",
"resolved": "https://raw.github.com/gist/1837112/index.js",
- "shasum": "c095cf7e65f8d725f2d77360e1a78cb9e8223633"
+ "shasum": "adbe13a8098564c4f1ae8226ef2298af645280e3"
},
"glob": {
"version": "3.1.5",
- "from": "glob@git://github.com/isaacs/node-glob.git#67bda227fd7a559cca5620307c7d30a6732a792f",
+ "from": "glob@git://github.com/isaacs/node-glob.git#npm-test",
"resolved": "git://github.com/isaacs/node-glob.git#67bda227fd7a559cca5620307c7d30a6732a792f",
"shasum": "16590c207c07b39b9c528fddbb0c73019847337c",
"dependencies": {
@@ -40,7 +40,7 @@
},
"inherits": {
"version": "1.0.0",
- "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
+ "from": "inherits@1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
"shasum": "5bdd80eb8dbe8ca822e18921e62ab726592062d2"
}
Please sign in to comment.
Something went wrong with that request. Please try again.