[Python-modules-commits] r11152 - in packages/epsilon/trunk/debian (2 files)

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

    Date: Thursday, January 14, 2010 @ 00:21:12
  Author: jwilk-guest
Revision: 11152

Fine-tune the Python 2.6 patch.

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

Modified: packages/epsilon/trunk/debian/changelog
===================================================================
--- packages/epsilon/trunk/debian/changelog	2010-01-14 00:16:58 UTC (rev 11151)
+++ packages/epsilon/trunk/debian/changelog	2010-01-14 00:21:12 UTC (rev 11152)
@@ -1,3 +1,9 @@
+epsilon (0.6.0-2) UNRELEASED; urgency=low
+
+  * Fine-tune the Python 2.6 patch.
+
+ -- Jakub Wilk <ubanus at users.sf.net>  Thu, 14 Jan 2010 01:20:32 +0100
+
 epsilon (0.6.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/epsilon/trunk/debian/patches/python-2.6.diff
===================================================================
--- packages/epsilon/trunk/debian/patches/python-2.6.diff	2010-01-14 00:16:58 UTC (rev 11151)
+++ packages/epsilon/trunk/debian/patches/python-2.6.diff	2010-01-14 00:21:12 UTC (rev 11152)
@@ -1,15 +1,14 @@
 # patch the search routine to avoid detecting temporary build directory
-Index: epsilon-0.5.12/epsilon/setuphelper.py
+Index: epsilon-0.6.0/epsilon/setuphelper.py
 ===================================================================
---- epsilon-0.5.12.orig/epsilon/setuphelper.py  2009-09-16 04:39:38.000000000 +0000
-+++ epsilon-0.5.12/epsilon/setuphelper.py       2009-09-16 04:39:44.000000000 +0000
-@@ -43,7 +43,8 @@
+--- 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 @@
+     pluginPackages = []
+ 
+     for (dirpath, dirnames, filenames) in os.walk(os.curdir):
++	if dirpath == 'build':
++            return
+         dirnames[:] = [p for p in dirnames if not p.startswith('.')]
          pkgName = dirpath[2:].replace('/', '.')
          if '__init__.py' in filenames:
-             # The current directory is a Python package
--            packages.append(pkgName)
-+            if 'build' not in dirpath:
-+                packages.append(pkgName)
-         elif 'plugins' in dirnames:
-             # The current directory is for the Twisted plugin system
-             pluginPackages.append(pkgName)