Fixed exclusion bug during folders scan.

This commit is contained in:
Virgil Dupras 2011-04-14 15:37:12 +02:00
parent 0b20b35ffb
commit 379e420577
2 changed files with 5 additions and 3 deletions

View File

@ -81,13 +81,14 @@ class Directories:
pass
def _get_folders(self, from_folder):
state = self.get_state(from_folder.path)
try:
for subfolder in from_folder.subfolders:
for folder in self._get_folders(subfolder):
yield folder
state = self.get_state(from_folder.path)
if state != DirectoryState.Excluded:
from_folder.is_ref = state == DirectoryState.Reference
logging.debug("Yielding Folder %r state: %d", from_folder, state)
yield from_folder
except (EnvironmentError, fs.InvalidPath):
pass

View File

@ -51,8 +51,9 @@ class Directories(DirectoriesBase):
if is_bundle(str(from_folder.path)):
# just yield the current folder and bail
state = self.get_state(from_folder.path)
from_folder.is_ref = state == DirectoryState.Reference
yield from_folder
if state != DirectoryState.Excluded:
from_folder.is_ref = state == DirectoryState.Reference
yield from_folder
return
else:
for folder in DirectoriesBase._get_folders(self, from_folder):