Commit 01972d44 authored by PJ Eby's avatar PJ Eby

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
parent 34e9acb9
......@@ -1602,6 +1602,9 @@ Release Notes/Change History
requirements are already in the working set, and enhanced performance of
directory scanning for distributions.
* The ``sdist`` command now recognizes Subversion "deleted file" entries and
does not include them in source distributions.
* Fixed some problems using ``pkg_resources`` w/PEP 302 loaders other than
``zipimport``, and the previously-broken "eager resource" support.
......
......@@ -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):
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment