[Python-modules-commits] r4674 - in packages/python-django/branches/0.96/debian (2 files)

[brettp-guest at users.alioth.debian.org]

    Date: Saturday, March 1, 2008 @ 20:14:37
  Author: brettp-guest
Revision: 4674

Fix for bash completion

Modified:
  packages/python-django/branches/0.96/debian/changelog
  packages/python-django/branches/0.96/debian/patches/02_bash_completion.diff

Modified: packages/python-django/branches/0.96/debian/changelog
===================================================================
--- packages/python-django/branches/0.96/debian/changelog	2008-03-01 18:26:45 UTC (rev 4673)
+++ packages/python-django/branches/0.96/debian/changelog	2008-03-01 20:14:37 UTC (rev 4674)
@@ -1,3 +1,10 @@
+python-django (0.96.1-3) unstable; urgency=low
+
+  * Fix for bash completion (Upstream bug 6661)
+    Closes: #450913
+
+ -- Brett Parker <iDunno at sommitrealweird.co.uk>  Sat, 01 Mar 2008 18:40:52 +0000
+
 python-django (0.96.1-2) unstable; urgency=low
 
   [ Brett Parker ]

Modified: packages/python-django/branches/0.96/debian/patches/02_bash_completion.diff
===================================================================
--- packages/python-django/branches/0.96/debian/patches/02_bash_completion.diff	2008-03-01 18:26:45 UTC (rev 4673)
+++ packages/python-django/branches/0.96/debian/patches/02_bash_completion.diff	2008-03-01 20:14:37 UTC (rev 4674)
@@ -1,6 +1,7 @@
---- extras/django_bash_completion_orig	2007-03-25 21:34:33.101350407 +0100
-+++ extras/django_bash_completion	2007-03-25 21:37:58.997083736 +0100
-@@ -54,7 +54,8 @@
+--- extras/django_bash_completion_orig
++++ extras/django_bash_completion
+@@ -53,21 +53,27 @@ _django_completion()
+     action_shell_opts="--plain"
      action_runfcgi_opts="host port socket method maxspare minspare maxchildren daemonize pidfile workdir"
  
 -    if [[ # django-admin.py, ./manage, manage.py
@@ -10,20 +11,42 @@
 +              ${COMP_WORDS[0]} == django-admin ||
                ${COMP_WORDS[0]} == ./manage.py ||
                ${COMP_WORDS[0]} == manage.py ) )
-@@ -68,5 +69,8 @@
+           ||
+           # python manage.py, /some/path/python manage.py (if manage.py exists)
            ( ${COMP_CWORD} -eq 2 &&
-             ( $( basename ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
+-            ( $( basename ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
+-            ( $( basename ${COMP_WORDS[1]} ) == manage.py) &&
++            ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
++            ( $( basename -- ${COMP_WORDS[1]} ) == manage.py) &&
+             ( -r ${COMP_WORDS[1]} ) ) 
+           ||
+           ( ${COMP_CWORD} -eq 2 &&
+-            ( $( basename ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
 -            ( $( basename ${COMP_WORDS[1]} ) == django-admin.py) &&
-+            ( 
-+                ( $( basename ${COMP_WORDS[1]} ) == django-admin.py) ||
-+                ( $( basename ${COMP_WORDS[1]} ) == django-admin)
-+            ) &&
++            ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
++            ( $( basename -- ${COMP_WORDS[1]} ) == django-admin.py) &&
++            ( -r ${COMP_WORDS[1]} ) ) 
++          ||
++          ( ${COMP_CWORD} -eq 2 &&
++            ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
++            ( $( basename -- ${COMP_WORDS[1]} ) == django-admin) &&
              ( -r ${COMP_WORDS[1]} ) ) ]] ; then
  
-@@ -143,5 +147,5 @@
+         case ${cur} in
+@@ -142,14 +148,14 @@ _django_completion()
+     fi
  }
  
 -complete -F _django_completion django-admin.py manage.py
 +complete -F _django_completion django-admin.py manage.py django-admin
  
  # Support for multiple interpreters.
+ unset pythons
+ if command -v whereis &>/dev/null; then
+     python_interpreters=$(whereis python | cut -d " " -f 2-) 
+     for python in $python_interpreters; do
+-        pythons="${pythons} $(basename $python)"
++        pythons="${pythons} $(basename -- $python)"
+     done
+     pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
+ else