Ticket #20189: ticket-20189.patch

django/conf/global_settings.py

@@ -603 +603 @@
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
+
+STATICFILES_IGNORE_PATTERNS = ['CVS', '.*', '*~']

django/contrib/staticfiles/management/commands/collectstatic.py

@@ -2 +2 @@
 
 import os
 import sys
+import warnings
 from optparse import make_option
 
+from django.conf import settings
 from django.core.files.storage import FileSystemStorage
 from django.core.management.base import CommandError, NoArgsCommand
 from django.utils.encoding import smart_text
@@ -70 +72 @@
         self.symlink = options['link']
         self.clear = options['clear']
         self.dry_run = options['dry_run']
-        ignore_patterns = options['ignore_patterns']
-        if options['use_default_ignore_patterns']:
-            ignore_patterns += ['CVS', '.*', '*~']
+
+        ignore_patterns = settings.STATICFILES_IGNORE_PATTERNS
+        ignore_patterns.extend(options['ignore_patterns'])
+        if not options['use_default_ignore_patterns']:
+            # Hard-coded patterns which were default before
+            ignore_patterns = set(ignore_patterns) - set(['CVS', '.*', '*~'])
+            warnings.warn("--no-default-ignore option will be ignored in"
+                          " future. Please override STATICFILES_IGNORE_PATTERS"
+                          " if you don't want to use default patterns.",
+                          PendingDeprecationWarning)
         self.ignore_patterns = list(set(ignore_patterns))
         self.post_process = options['post_process']
 

docs/ref/contrib/staticfiles.txt

@@ -26 +26 @@
 * :setting:`STATIC_ROOT`
 * :setting:`STATIC_URL`
 * :setting:`STATICFILES_DIRS`
+* :setting:`STATICFILES_IGNORE_PATTERNS`
 * :setting:`STATICFILES_STORAGE`
 * :setting:`STATICFILES_FINDERS`
 
@@ -99 +100 @@
     Don't ignore the common private glob-style patterns ``'CVS'``, ``'.*'``
     and ``'*~'``.
 
+    .. versionchanged:: 1.7
+
+    This option is deprecated and will be ignored in future. Please set
+    :setting:`STATICFILES_IGNORE_PATTERNS` instead.
+
 For a full list of options, refer to the commands own help by running::
 
    $ python manage.py collectstatic --help

docs/ref/settings.txt

@@ -2547 +2547 @@
 
     <a href="{{ STATIC_URL }}downloads/polls_20101022.tar.gz">
 
+.. setting:: STATICFILES_IGNORE_PATTERNS
+
+STATICFILES_IGNORE_PATTERNS
+---------------------------
+
+.. versionadded:: 1.7
+
+Default: ``['CVS', '.*', '*~']``
+
+List of file patterns which will be ignored when collecting static files with
+the :djadmin:`collectstatic` management command.
+
+This list can be further extended with command line option ``-i``.
+
 .. setting:: STATICFILES_STORAGE
 
 STATICFILES_STORAGE