[Python-modules-commits] r13755 - in packages/mod-wsgi/trunk/debian (2 files)

[bzed at users.alioth.debian.org]

    Date: Friday, July 2, 2010 @ 10:52:48
  Author: bzed
Revision: 13755

Ensure that the mod-wsgi symlink is updated to the current default Python
version while installing the package. This is only necessary in rare cases
(when the default Python version was updated after the last rebuild of
mod-wsgi), but it needs to be handled properly.

Modified:
  packages/mod-wsgi/trunk/debian/changelog
  packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst

Modified: packages/mod-wsgi/trunk/debian/changelog
===================================================================
--- packages/mod-wsgi/trunk/debian/changelog	2010-07-02 01:29:59 UTC (rev 13754)
+++ packages/mod-wsgi/trunk/debian/changelog	2010-07-02 10:52:48 UTC (rev 13755)
@@ -1,9 +1,16 @@
 mod-wsgi (3.2-3) UNRELEASED; urgency=low
 
+  [ Sameer Rahmani ]
   * watch file fixed.
 
- -- Sameer Rahmani <lxsameer at gmail.com>  Mon, 24 May 2010 01:23:24 +0430
+  [ Bernd Zeimetz ]
+  * Ensure that the mod-wsgi symlink is updated to the current default Python
+    version while installing the package. This is only necessary in rare cases
+    (when the default Python version was updated after the last rebuild of
+    mod-wsgi), but it needs to be handled properly.
 
+ -- Bernd Zeimetz <bzed at debian.org>  Fri, 02 Jul 2010 12:50:57 +0200
+
 mod-wsgi (3.2-2) unstable; urgency=low
 
   * mod-wsgi needs to depend on libpython for Python > 2.5.

Modified: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst	2010-07-02 01:29:59 UTC (rev 13754)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst	2010-07-02 10:52:48 UTC (rev 13755)
@@ -13,6 +13,11 @@
 }
 
 if [ -z "$2" ]; then
+    wsgi_py=`readlink /usr/lib/apache2/modules/mod_wsgi.so | sed 's,.*-,,'`
+    py_default=`dpkg -s python | grep '^Version' | sed 's,Version: \([^.]*.[^.]*\).*,\1,'`
+    if [ ! "${wsgi_py}" = "${py_default}" ]; then
+        ln -sf mod_wsgi.so-${py_default} /usr/lib/apache2/modules/mod_wsgi.so
+    fi
     if [ -e /etc/apache2/apache2.conf ]; then
         a2enmod wsgi >/dev/null || true
         apache_force_reload