Improvement in the patches of the brach 1.4 and 1.5

goinnn · Oct 1, 2013 · 33883e0 · 33883e0
1 parent 4f82a02
commit 33883e0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -90,7 +90,11 @@ Patche
 
 If you set TEMPLATE_DEBUG = False in settings.py you must patch django code. You can find the patch in the patches directoy::
 
-    patch -p2 -N -d my/path/of/django/ -i ./patches/patch.diff
+    # If you are using django 1.5   
+    patch -p2 -N -d my/path/of/django/ -i ./patches/patch1.5.diff
+    # Or this if you are using django 1.4
+    patch -p2 -N -d my/path/of/django/ -i ./patches/patch1.4.diff
+
 
 Reported
 ========

diff --git a/patches/patch.diff → patches/patch1.5.diff b/patches/patch.diff → patches/patch1.5.diff
@@ -49,3 +49,4 @@ index cfffb40..244abf3 100644
          return LoaderOrigin(display_name, loader, name, dirs)
      else:
          return None
++    return None
diff --git a/tox.ini b/tox.ini
@@ -8,29 +8,29 @@ install_command =
 [testenv:py27-dj15]
 basepython = python2.7
 commands =
-    patch -p2 -N -d {toxinidir}/.tox/py27-dj15/lib/python2.7/site-packages/django/ -i {toxinidir}/patches/patch.diff
+    patch -p2 -N -d {toxinidir}/.tox/py27-dj15/lib/python2.7/site-packages/django/ -i {toxinidir}/patches/patch1.5.diff
     python example/run_tests.py
-    patch -p2 -R -N -d {toxinidir}/.tox/py27-dj15/lib/python2.7/site-packages/django/ -i {toxinidir}/patches/patch.diff
+    patch -p2 -R -N -d {toxinidir}/.tox/py27-dj15/lib/python2.7/site-packages/django/ -i {toxinidir}/patches/patch1.5.diff
 deps =
     django==1.5.4
     pillow==1.7.8
 
 [testenv:py27-dj14]
 basepython = python2.7
 commands =
-    patch -p2 -N -d {toxinidir}/.tox/py27-dj14/lib/python2.7/site-packages/django/ -i {toxinidir}/patches/patch.diff
+    patch -p2 -N -d {toxinidir}/.tox/py27-dj14/lib/python2.7/site-packages/django/ -i {toxinidir}/patches/patch1.4.diff
     python example/run_tests.py
-    patch -p2 -R -N -d {toxinidir}/.tox/py27-dj14/lib/python2.7/site-packages/django/ -i {toxinidir}/patches/patch.diff
+    patch -p2 -R -N -d {toxinidir}/.tox/py27-dj14/lib/python2.7/site-packages/django/ -i {toxinidir}/patches/patch1.4.diff
 deps =
     django==1.4.8
     pillow==1.7.8
 
 [testenv:py33-dj15]
 basepython = python3.3
 commands =
-    patch -p2 -N -d {toxinidir}/.tox/py33-dj15/lib/python3.3/site-packages/django/ -i {toxinidir}/patches/patch.diff
+    patch -p2 -N -d {toxinidir}/.tox/py33-dj15/lib/python3.3/site-packages/django/ -i {toxinidir}/patches/patch1.5.diff
     python example/run_tests.py
-    patch -p2 -R -N -d {toxinidir}/.tox/py33-dj15/lib/python3.3/site-packages/django/ -i {toxinidir}/patches/patch.diff
+    patch -p2 -R -N -d {toxinidir}/.tox/py33-dj15/lib/python3.3/site-packages/django/ -i {toxinidir}/patches/patch1.5.diff
 deps =
     django==1.5.4
     pillow==2.1.0