Fix a regression introduced a few commits back.

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/utils/load-package-defaults.js b/lib/utils/load-package-defaults.js
index 31af9cd8b..5d2e08343 100644
--- a/lib/utils/load-package-defaults.js
+++ b/lib/utils/load-package-defaults.js
@@ -35,6 +35,7 @@ function readDefaultMans (pkg, cb) {
 
 // shim ROOT/{name}-{version}/**/*.js to ROOT/.npm/{name}/{version}/{lib}/**/*.js
 function readDefaultModules (pkg, cb) {
+  log.verbose(pkg._id, "readDefaultModules")
   var lib = pkg.directories && pkg.directories.lib || pkg.lib
     , pkgDir = path.join(npm.dir, pkg.name, pkg.version, "package")
     , libDir = path.join(pkgDir, lib)
@@ -44,15 +45,19 @@ function readDefaultModules (pkg, cb) {
   find(libDir, /\.(js|node)$/, function (er, filenames) {
     if (er) return cb(er)
     filenames.filter(function(_){return _}).forEach(function (filename) {
-      filename = path.basename(filename, path.extname(filename))
+      log.silly(filename, pkg._id+" lib file")
+      // filename = path.basename(filename, path.extname(filename))
       var key = filename.substr(libDir.length + 1)
         , val = filename.substr(pkgDir.length + 1)
+      key = path.join(path.dirname(key), path.basename(key, path.extname(key)))
+      log.silly(key+"="+val, "module")
       if (key.length && val.length) pkg.modules[key] = val
     })
     // require("foo/foo") is dumb, and happens a lot.
     if (!pkg.main && !pkg.modules.index && pkg.modules[pkg.name]) {
       pkg.modules.index = pkg.modules[pkg.name]
     }
+    log.silly(pkg.modules, pkg._id+".modules")
     return cb(null, pkg)
   })
 }