From f9637ec1356db642b0ea9b9cefe23642aa98e770 Mon Sep 17 00:00:00 2001
From: Kevin Falcone <kevin@jibsheet.com>
Date: Thu, 21 Apr 2016 11:38:30 -0400
Subject: [PATCH] Revert "clear existing assets before copying new assets"
---
pavelib/assets.py | 2 +-
pavelib/paver_tests/test_servers.py | 2 +-
test_root/.gitignore | 1 +
test_root/staticfiles/cms/.gitkeep | 0
test_root/staticfiles/lms/.gitkeep | 0
5 files changed, 3 insertions(+), 2 deletions(-)
delete mode 100644 test_root/staticfiles/cms/.gitkeep
delete mode 100644 test_root/staticfiles/lms/.gitkeep
diff --git a/pavelib/assets.py b/pavelib/assets.py
index a70c083fac0..1faa8facdb5 100644
--- a/pavelib/assets.py
+++ b/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))
diff --git a/pavelib/paver_tests/test_servers.py b/pavelib/paver_tests/test_servers.py
index 1c3b2f69643..126f016670d 100644
--- a/pavelib/paver_tests/test_servers.py
+++ b/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=."
diff --git a/test_root/.gitignore b/test_root/.gitignore
index b3e5512f73a..a17bd47875c 100644
--- a/test_root/.gitignore
+++ b/test_root/.gitignore
@@ -1,2 +1,3 @@
local_repo
remote_repo
+staticfiles
diff --git a/test_root/staticfiles/cms/.gitkeep b/test_root/staticfiles/cms/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test_root/staticfiles/lms/.gitkeep b/test_root/staticfiles/lms/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
--
GitLab