From 1d928f6a64130184576b7bb2f4850ce15fac1ad8 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 31 May 2007 20:40:49 +0000 Subject: [PATCH] Hopefully fixing the patch application - Legacy-Id: 196 --- test/patch-django | 8 +++----- test/r5106.patch | 10 ---------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/test/patch-django b/test/patch-django index 8fc94cc31..ded6c3c15 100755 --- a/test/patch-django +++ b/test/patch-django @@ -8,10 +8,8 @@ # build=$PWD -django=$(python -c "import django; print django.__path__[0]") +django=$(python -c "import django; import os.path; print os.path.realpath(django.__path__[0])") rsync -Cav $django $build/test/lib/ -cd $build/test/lib/ -patch -p 2 < $build/test/r5105.patch - -exit 0 +cd $build/test/lib +patch -p 3 < $build/test/r5106.patch diff --git a/test/r5106.patch b/test/r5106.patch index 7168474e6..3f6f74003 100644 --- a/test/r5106.patch +++ b/test/r5106.patch @@ -9,13 +9,3 @@ Index: /django/trunk/django/core/management.py + rel_field = rel_field.rel.get_related_field() data_type = get_rel_data_type(rel_field) else: -Index: /django/trunk/AUTHORS -=================================================================== ---- /django/trunk/AUTHORS (revision 5102) -+++ /django/trunk/AUTHORS (revision 5106) -@@ -165,4 +165,5 @@ - Robert Myers - Nebojša Dorđević -+ Gopal Narayanan - Fraser Nevett - Sam Newman