Show More
@@ -225,13 +225,16 b' class match(object):' | |||||
225 | if dir in self._excluderoots: |
|
225 | if dir in self._excluderoots: | |
226 | return False |
|
226 | return False | |
227 | parentdirs = None |
|
227 | parentdirs = None | |
228 |
if (self._includeroots and |
|
228 | if (self._includeroots and | |
|
229 | dir not in self._includeroots and | |||
229 |
|
|
230 | dir not in self._includedirs): | |
230 | parentdirs = list(util.finddirs(dir)) |
|
231 | parentdirs = list(util.finddirs(dir)) | |
231 | if not any(parent in self._includeroots for parent in parentdirs): |
|
232 | if not any(parent in self._includeroots for parent in parentdirs): | |
232 | return False |
|
233 | return False | |
233 |
return (not self._fileroots or |
|
234 | return (not self._fileroots or | |
234 |
|
|
235 | '.' in self._fileroots or | |
|
236 | dir in self._fileroots or | |||
|
237 | dir in self._dirs or | |||
235 | any(parentdir in self._fileroots |
|
238 | any(parentdir in self._fileroots | |
236 | for parentdir in parentdirs or util.finddirs(dir))) |
|
239 | for parentdir in parentdirs or util.finddirs(dir))) | |
237 |
|
240 |
General Comments 0
You need to be logged in to leave comments.
Login now