summaryrefslogtreecommitdiff
path: root/deps/npm/lib
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2012-03-19 09:59:51 -0700
committerisaacs <i@izs.me>2012-03-19 09:59:57 -0700
commit89653cb32fa943735b1dd300c727ec5133d6f1da (patch)
treed95558ada5245b1d62588f903fb5a23d28a000c1 /deps/npm/lib
parent7418905aef0c0fcbd13227526adc34f1e699fe45 (diff)
downloadnode-new-89653cb32fa943735b1dd300c727ec5133d6f1da.tar.gz
Upgrade npm to 1.1.10
Diffstat (limited to 'deps/npm/lib')
-rw-r--r--deps/npm/lib/utils/excludes.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/deps/npm/lib/utils/excludes.js b/deps/npm/lib/utils/excludes.js
index 75fe41c057..83935ee35d 100644
--- a/deps/npm/lib/utils/excludes.js
+++ b/deps/npm/lib/utils/excludes.js
@@ -92,6 +92,7 @@ function test (file, excludeList) {
// log.warn(excludeList, "test list")
var incRe = /^\!(\!\!)*/
, excluded = false
+ , mmconf = { matchBase: true, dot: true }
for (var i = 0, l = excludeList.length; i < l; i ++) {
var excludes = excludeList[i]
, dir = excludes.dir
@@ -121,12 +122,12 @@ function test (file, excludeList) {
if (inc && !excluded) continue
// if it matches the pattern, then it should be excluded.
- excluded = !!minimatch(rf, ex, { matchBase: true })
+ excluded = !!minimatch(rf, ex, mmconf)
// log.error([rf, ex, excluded], "rf, ex, excluded")
// if you include foo, then it also includes foo/bar.js
if (inc && excluded && ex.slice(-3) !== "/**") {
- excluded = minimatch(rf, ex + "/**", { matchBase: true })
+ excluded = minimatch(rf, ex + "/**", mmconf)
// log.warn([rf, ex + "/**", inc, excluded], "dir without /")
}
@@ -141,6 +142,7 @@ function test (file, excludeList) {
ll ++
}
}
+
// log.warn([rf, excluded, excludes], "rf, excluded, excludes")
}
// true if it *should* be included