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

[morph at users.alioth.debian.org]

    Date: Sunday, September 29, 2013 @ 16:59:00
  Author: morph
Revision: 26005

* debian/patches/30_ppworker_invoke_via-m.patch
  - removed, merged upstream

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

Modified: packages/parallelpython/trunk/debian/changelog
===================================================================
--- packages/parallelpython/trunk/debian/changelog	2013-09-29 16:52:10 UTC (rev 26004)
+++ packages/parallelpython/trunk/debian/changelog	2013-09-29 16:59:00 UTC (rev 26005)
@@ -7,11 +7,13 @@
     - extend packaging copyright years
   * debian/patches/10_remove_default_password.patch
     - updated to new upstream code
+  * debian/patches/30_ppworker_invoke_via-m.patch
+    - removed, merged upstream
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Sandro Tosi <morph at debian.org>  Sun, 29 Sep 2013 18:52:00 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 29 Sep 2013 18:58:48 +0200
 
 parallelpython (1.6.2-2) unstable; urgency=low
 

Deleted: packages/parallelpython/trunk/debian/patches/30_ppworker_invoke_via-m.patch
===================================================================
--- packages/parallelpython/trunk/debian/patches/30_ppworker_invoke_via-m.patch	2013-09-29 16:52:10 UTC (rev 26004)
+++ packages/parallelpython/trunk/debian/patches/30_ppworker_invoke_via-m.patch	2013-09-29 16:59:00 UTC (rev 26005)
@@ -1,26 +0,0 @@
-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-09-29 16:52:10 UTC (rev 26004)
+++ packages/parallelpython/trunk/debian/patches/series	2013-09-29 16:59:00 UTC (rev 26005)
@@ -1,3 +1,2 @@
 10_remove_default_password.patch
 20_hyphen-used-as-minus-sign.patch
-30_ppworker_invoke_via-m.patch