[Python-modules-commits] r12504 - in packages/scipy/trunk/debian (5 files)

[dktrkranz at users.alioth.debian.org]

    Date: Monday, April 5, 2010 @ 14:45:11
  Author: dktrkranz
Revision: 12504

Restore sys.argv in case of exception (Closes: #500814)

Added:
  packages/scipy/trunk/debian/patches/
  packages/scipy/trunk/debian/patches/restore_sys_argv.patch
  packages/scipy/trunk/debian/patches/series
Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/source/format

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2010-04-05 14:37:39 UTC (rev 12503)
+++ packages/scipy/trunk/debian/changelog	2010-04-05 14:45:11 UTC (rev 12504)
@@ -8,6 +8,8 @@
   * New upstream release.
     - Fix KeyError exception in sparse module (Closes: #525109).
     - Fix SyntaxWarning exception with python2.6 (Closes: #567148).
+  * debian/patches/restore_sys_argv.patch:
+    - Restore sys.argv in case of exception (Closes: #500814).
   * debian/control:
     - Drop useless Conflicts/Replaces fields.
   * debian/README.Debian:
@@ -15,7 +17,7 @@
   * debian/pycompat:
     - Remove, useless.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Mon, 05 Apr 2010 16:31:53 +0200
+ -- Luca Falavigna <dktrkranz at debian.org>  Mon, 05 Apr 2010 16:43:27 +0200
 
 python-scipy (0.7.0-2) unstable; urgency=medium
 

Added: packages/scipy/trunk/debian/patches/restore_sys_argv.patch
===================================================================
--- packages/scipy/trunk/debian/patches/restore_sys_argv.patch	                        (rev 0)
+++ packages/scipy/trunk/debian/patches/restore_sys_argv.patch	2010-04-05 14:45:11 UTC (rev 12504)
@@ -0,0 +1,17 @@
+Description: restore sys.argv in case of exception
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=500814
+
+Index: scipy-0.7.1/scipy/weave/build_tools.py
+===================================================================
+--- scipy-0.7.1.orig/scipy/weave/build_tools.py	2010-04-05 16:40:02.377973881 +0200
++++ scipy-0.7.1/scipy/weave/build_tools.py	2010-04-05 16:41:02.685970432 +0200
+@@ -283,6 +283,9 @@
+         configure_python_path(build_dir)
+     except SyntaxError: #TypeError:
+         success = 0
++    except Exception, e:
++        restore_sys_argv()
++        raise e
+ 
+     # restore argv after our trick...
+     restore_sys_argv()

Added: packages/scipy/trunk/debian/patches/series
===================================================================
--- packages/scipy/trunk/debian/patches/series	                        (rev 0)
+++ packages/scipy/trunk/debian/patches/series	2010-04-05 14:45:11 UTC (rev 12504)
@@ -0,0 +1 @@
+restore_sys_argv.patch

Modified: packages/scipy/trunk/debian/source/format
===================================================================
--- packages/scipy/trunk/debian/source/format	2010-04-05 14:37:39 UTC (rev 12503)
+++ packages/scipy/trunk/debian/source/format	2010-04-05 14:45:11 UTC (rev 12504)
@@ -1 +1 @@
-1.0
+3.0 (quilt)