diff options
| author | Justin Hamade <justhamade@gmail.com> | 2014-08-08 22:47:35 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2014-08-08 22:55:45 +0200 |
| commit | 98d6f128d0fd5aec0c8d49da273e369e8345a726 (patch) | |
| tree | 067795b9f3fb4eda687144461850bfcd0744cb77 /django | |
| parent | ab883a3477147faece3484d50f7e38bf9b138d8f (diff) | |
[1.7.x] Fixed #22336 -- Added path matching for makemessages ignore option
This fixes a regression introduced by 9012a9e200.
Backport of 8fe406864c from master.
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/management/commands/makemessages.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py index 158545313b..7f55144ce3 100644 --- a/django/core/management/commands/makemessages.py +++ b/django/core/management/commands/makemessages.py @@ -349,7 +349,8 @@ class Command(NoArgsCommand): Check if the given path should be ignored or not. """ filename = os.path.basename(path) - ignore = lambda pattern: fnmatch.fnmatchcase(filename, pattern) + ignore = lambda pattern: (fnmatch.fnmatchcase(filename, pattern) or + fnmatch.fnmatchcase(path, pattern)) return any(ignore(pattern) for pattern in ignore_patterns) dir_suffix = '%s*' % os.sep |