[Python-modules-commits] r23372 - in packages/parallelpython/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Wednesday, January 23, 2013 @ 19:09:17
  Author: morph
Revision: 23372

Invoke ppworker via "python -m" avoiding addition of /usr/share/pyshared
to sys.path; thanks to Zbigniew J?\196?\153drzejewski-Szmek for the report and to
Yaroslav Halchenko, Jakub Wilk for the fix; Closes: #620551

Added:
  packages/parallelpython/trunk/debian/patches/30_ppworker_invoke_via-m.patch
Modified:
  packages/parallelpython/trunk/debian/changelog
  packages/parallelpython/trunk/debian/patches/series

Modified: packages/parallelpython/trunk/debian/changelog
===================================================================
--- packages/parallelpython/trunk/debian/changelog	2013-01-21 19:13:36 UTC (rev 23371)
+++ packages/parallelpython/trunk/debian/changelog	2013-01-23 19:09:17 UTC (rev 23372)
@@ -1,3 +1,11 @@
+parallelpython (1.6.2-2) UNRELEASED; urgency=low
+
+  * Invoke ppworker via "python -m" avoiding addition of /usr/share/pyshared
+    to sys.path; thanks to Zbigniew Jędrzejewski-Szmek for the report and to
+    Yaroslav Halchenko, Jakub Wilk for the fix; Closes: #620551
+
+ -- Sandro Tosi <morph at debian.org>  Wed, 23 Jan 2013 20:00:24 +0100
+
 parallelpython (1.6.2-1) unstable; urgency=low
 
   * New upstream release

Added: packages/parallelpython/trunk/debian/patches/30_ppworker_invoke_via-m.patch
===================================================================
--- packages/parallelpython/trunk/debian/patches/30_ppworker_invoke_via-m.patch	                        (rev 0)
+++ packages/parallelpython/trunk/debian/patches/30_ppworker_invoke_via-m.patch	2013-01-23 19:09:17 UTC (rev 23372)
@@ -0,0 +1,26 @@
+From: Yaroslav Halchenko <debian at onerussian.com>
+Author: Jakub Wilk <jwilk at debian.org>
+Subject: Do not invoke ppworker script directory -- run it via -m option of python
+
+ Invocation of script directly results in Python adding a directory containing
+ the symlink-dereferenced path to the script into the path.  On Debian systems
+ it would result in adding /usr/share/pyshared path to the sys.path breaking
+ import of many modules.
+
+Origin: Debian
+Bug-Debian: http://bugs.debian.org/620551
+Last-Update: 2013-01-22
+
+--- a/pp.py
++++ b/pp.py
+@@ -127,9 +127,7 @@ class _Task(object):
+ class _Worker(object):
+     """Local worker class
+     """
+-    command = [sys.executable, "-u",
+-            os.path.dirname(os.path.abspath(__file__))
+-            + os.sep + "ppworker.py"]
++    command = [sys.executable, "-u", "-m" , "ppworker"]
+ 
+     command.append("2>/dev/null")
+ 

Modified: packages/parallelpython/trunk/debian/patches/series
===================================================================
--- packages/parallelpython/trunk/debian/patches/series	2013-01-21 19:13:36 UTC (rev 23371)
+++ packages/parallelpython/trunk/debian/patches/series	2013-01-23 19:09:17 UTC (rev 23372)
@@ -1,2 +1,3 @@
 10_remove_default_password.patch
 20_hyphen-used-as-minus-sign.patch
+30_ppworker_invoke_via-m.patch