[Python-modules-commits] [python-django] 02/03: Improve migrate-south script to look for Python files in the current dir

Raphaël Hertzog hertzog at moszumanska.debian.org
Wed Oct 15 10:08:24 UTC 2014


This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/sid
in repository python-django.

commit 2a072abd499e11e447dc3738506faae6f34dcd8e
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Wed Oct 15 10:38:27 2014 +0200

    Improve migrate-south script to look for Python files in the current dir
    
    ./manage.py implicitely has the current directory but when we use
    django-admin it's not the case. Thanks to Uwe Kleine-Koenig for the
    report.
---
 debian/changelog             | 4 ++++
 debian/contrib/migrate-south | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5fcef00..dc87137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ python-django (1.7-3) UNRELEASED; urgency=medium
 
   * Add 01_fix_test_loaddata_not_existant_fixture_file.patch
     to fix FTBFS with Python 3.4.2. Closes: #765117
+  * Improve migrate-south script to look for Python files in the current dir.
+    ./manage.py implicitely has the current directory but when we use
+    django-admin it's not the case. Thanks to Uwe Kleine-Koenig for the
+    report.
 
  -- Raphaël Hertzog <hertzog at debian.org>  Wed, 15 Oct 2014 10:29:27 +0200
 
diff --git a/debian/contrib/migrate-south b/debian/contrib/migrate-south
index 55de901..cc40f51 100755
--- a/debian/contrib/migrate-south
+++ b/debian/contrib/migrate-south
@@ -11,4 +11,4 @@ pip install django==1.6.5
 pip install south
 
 CMD="$(command -v django-admin)"
-python "$CMD" migrate "$@"
+PYTHONPATH="$PWD" python "$CMD" migrate "$@"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git



More information about the Python-modules-commits mailing list