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

[bzed at users.alioth.debian.org]

    Date: Friday, July 2, 2010 @ 11:54:31
  Author: bzed
Revision: 13756

  version while installing/upgrading 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 10:52:48 UTC (rev 13755)
+++ packages/mod-wsgi/trunk/debian/changelog	2010-07-02 11:54:31 UTC (rev 13756)
@@ -5,11 +5,11 @@
 
   [ 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.
+    version while installing/upgrading 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
+ -- Bernd Zeimetz <bzed at debian.org>  Fri, 02 Jul 2010 13:54:04 +0200
 
 mod-wsgi (3.2-2) unstable; urgency=low
 

Modified: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst	2010-07-02 10:52:48 UTC (rev 13755)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.postinst	2010-07-02 11:54:31 UTC (rev 13756)
@@ -12,18 +12,23 @@
     fi
 }
 
-if [ -z "$2" ]; then
+update_symlink() {
     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 [ -z "$2" ]; then
+    update_symlink
     if [ -e /etc/apache2/apache2.conf ]; then
         a2enmod wsgi >/dev/null || true
         apache_force_reload
     fi
 else
     #we're upgrading
+    update_symlink
     if [ -e /etc/apache2/mods-enabled/wsgi.load ]; then
         apache_force_reload
     fi