summaryrefslogtreecommitdiff
path: root/deps/npm/lib
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2012-08-22 01:19:50 -0700
committerisaacs <i@izs.me>2012-08-22 11:03:15 -0700
commitc259499945af1079b1e4e92c57a1140659f6261a (patch)
tree7945a3e412f0ebff76f9b6e812430498fea62cc0 /deps/npm/lib
parentee200942dd7af613892883def5ac53862afc9129 (diff)
downloadnode-new-c259499945af1079b1e4e92c57a1140659f6261a.tar.gz
npm: Upgrade to 1.1.59
Diffstat (limited to 'deps/npm/lib')
-rw-r--r--deps/npm/lib/npm.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js
index 5728f7343b..8f42b27840 100644
--- a/deps/npm/lib/npm.js
+++ b/deps/npm/lib/npm.js
@@ -265,7 +265,8 @@ function load (npm, cli, cb) {
// look up configs
//console.error("about to look up configs")
- npmconf.load(cli, function (er, conf) {
+ var builtin = path.resolve(__dirname, "..", "npmrc")
+ npmconf.load(cli, builtin, function (er, conf) {
if (er === conf) er = null
npm.config = conf