aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt7
-rwxr-xr-xsetuptools/command/sdist.py3
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index a76a147b..dbe33d0a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
CHANGES
=======
+-----
+2.1.1
+-----
+
+* Issue #139: Fix regression in re_finder for CVS repos (and maybe Git repos
+ as well).
+
---
2.1
---
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index b59cc390..04cbccdf 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -40,7 +40,7 @@ class re_finder(object):
path = self.postproc(path)
yield svn_utils.joinpath(dirname,path)
- def __call__(self, dirname=''):
+ def find(self, dirname=''):
path = svn_utils.joinpath(dirname, self.path)
if os.path.isfile(path):
@@ -50,6 +50,7 @@ class re_finder(object):
elif os.path.isdir(path):
for item in self.find(path):
yield item
+ __call__ = find
def _default_revctrl(dirname=''):