Commit 152afade authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Merge pull request #3075 from ramiro/makemessages-ignore-windows

Fixed #23298 -- Made makemessages actually ignore specified dirs on Wind...
parents e0a98e23 b4dce7c3
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -364,8 +364,17 @@ class Command(BaseCommand):
                fnmatch.fnmatchcase(path, pattern))
            return any(ignore(pattern) for pattern in ignore_patterns)

        dir_suffix = '%s*' % os.sep
        norm_patterns = [p[:-len(dir_suffix)] if p.endswith(dir_suffix) else p for p in self.ignore_patterns]
        ignore_patterns = [os.path.normcase(p) for p in self.ignore_patterns]
        dir_suffixes = {'%s*' % path_sep for path_sep in {'/', os.sep}}
        norm_patterns = []
        for p in ignore_patterns:
            for dir_suffix in dir_suffixes:
                if p.endswith(dir_suffix):
                    norm_patterns.append(p[:-len(dir_suffix)])
                    break
            else:
                norm_patterns.append(p)

        all_files = []
        for dirpath, dirnames, filenames in os.walk(root, topdown=True, followlinks=self.symlinks):
            for dirname in dirnames[:]: