Merge pull request #12217 from…

Merge pull request #12217 from edx/revert-12074-derf/clear_existing_assets_before_copying_new_assets

Revert "clear existing assets before copying new assets"

pavelib/assets.py

@@ -378,7 +378,7 @@ def collect_assets(systems, settings):
     `settings` is the Django settings module to use.
     """
     for sys in systems:
-        sh(django_cmd(sys, settings, "collectstatic --clear --noinput"))
+        sh(django_cmd(sys, settings, "collectstatic --noinput > /dev/null"))
         print("\t\tFinished collecting {} assets.".format(sys))
 
 

pavelib/paver_tests/test_servers.py

@@ -28,7 +28,7 @@ EXPECTED_PREPROCESS_ASSETS_COMMAND = (
     u" {system}/static/sass/*.scss {system}/static/themed_sass"
 )
 EXPECTED_COLLECT_STATIC_COMMAND = (
-    u"python manage.py {system} --settings={asset_settings} collectstatic --clear --noinput"
+    u"python manage.py {system} --settings={asset_settings} collectstatic --noinput > /dev/null"
 )
 EXPECTED_CELERY_COMMAND = (
     u"python manage.py lms --settings={settings} celery worker --beat --loglevel=INFO --pythonpath=."

test_root/.gitignore

 local_repo
 remote_repo
+staticfiles