aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/sdist.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2005-08-06 16:26:44 +0000
committerPJ Eby <distutils-sig@python.org>2005-08-06 16:26:44 +0000
commit01972d44570029e8b54ce3719a83a5f2d81f2d8b (patch)
treee6594e44c8e71b8a1ebfbe32871c65d8ac31d51d /setuptools/command/sdist.py
parent34e9acb9b0572b1f0503ee9e56439b768e575e83 (diff)
downloadexternal_python_setuptools-01972d44570029e8b54ce3719a83a5f2d81f2d8b.tar.gz
external_python_setuptools-01972d44570029e8b54ce3719a83a5f2d81f2d8b.tar.bz2
external_python_setuptools-01972d44570029e8b54ce3719a83a5f2d81f2d8b.zip
Fix wrongly including files that Subversion has marked deleted.
--HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041177
Diffstat (limited to 'setuptools/command/sdist.py')
-rwxr-xr-xsetuptools/command/sdist.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 425ed8ba..cdbc5248 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -84,7 +84,11 @@ finders = [
(convert_path('CVS/Entries'),
re_finder(re.compile(r"^\w?/([^/]+)/", re.M))),
(convert_path('.svn/entries'),
- re_finder(re.compile(r'name="([^"]+)"'), unescape)),
+ re_finder(
+ re.compile(r'name="([^"]+)"(?![^>]+deleted="true")', re.I),
+ unescape
+ )
+ ),
(convert_path('.svn/dir-props'), externals_finder),
]
@@ -117,7 +121,3 @@ class sdist(_sdist):
-
-
-
-