[Python-modules-commits] r11153 - in packages/epsilon/trunk/debian/patches (python-2.6.diff)

[jwilk-guest at users.alioth.debian.org]

    Date: Thursday, January 14, 2010 @ 11:57:16
  Author: jwilk-guest
Revision: 11153

Yet another fix for the Python 2.6 patch.

Modified:
  packages/epsilon/trunk/debian/patches/python-2.6.diff

Modified: packages/epsilon/trunk/debian/patches/python-2.6.diff
===================================================================
--- packages/epsilon/trunk/debian/patches/python-2.6.diff	2010-01-14 00:21:12 UTC (rev 11152)
+++ packages/epsilon/trunk/debian/patches/python-2.6.diff	2010-01-14 11:57:16 UTC (rev 11153)
@@ -1,14 +1,14 @@
 # patch the search routine to avoid detecting temporary build directory
 Index: epsilon-0.6.0/epsilon/setuphelper.py
 ===================================================================
---- epsilon-0.6.0.orig/epsilon/setuphelper.py	2010-01-14 00:39:07.000000000 +0100
-+++ epsilon-0.6.0/epsilon/setuphelper.py	2010-01-14 00:42:10.000000000 +0100
-@@ -39,6 +39,8 @@
+--- epsilon-0.6.0.orig/epsilon/setuphelper.py   2010-01-14 11:53:32.000000000 +0000
++++ epsilon-0.6.0/epsilon/setuphelper.py        2010-01-14 11:54:18.000000000 +0000
+@@ -39,7 +39,7 @@
      pluginPackages = []
- 
+
      for (dirpath, dirnames, filenames) in os.walk(os.curdir):
-+	if dirpath == 'build':
-+            return
-         dirnames[:] = [p for p in dirnames if not p.startswith('.')]
+-        dirnames[:] = [p for p in dirnames if not p.startswith('.')]
++        dirnames[:] = [p for p in dirnames if not p.startswith('.') and p != 'build']
          pkgName = dirpath[2:].replace('/', '.')
          if '__init__.py' in filenames:
+             # The current directory is a Python package