diff options
| author | Philip Thiem <ptthiem@gmail.com> | 2014-04-23 21:54:27 -0500 |
|---|---|---|
| committer | Philip Thiem <ptthiem@gmail.com> | 2014-04-23 21:54:27 -0500 |
| commit | d118aae6b768cfdf387aca862e150e7736c7cd71 (patch) | |
| tree | 953d6dd67a97201a8d3254cad40be474995412a0 | |
| parent | c147c6789efe24bf54e20d5644aa338bd532adb7 (diff) | |
| download | python-setuptools-git-d118aae6b768cfdf387aca862e150e7736c7cd71.tar.gz | |
Prune paths file list starting with (RCS|CVS|.svn) as well as path with
such sub directories.
--HG--
branch : develop
extra : rebase_source : 2b3326fe668e880b351b0d5f388472239d915d58
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rwxr-xr-x | setuptools/command/egg_info.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 5a2b17ae..73569cc9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -46,6 +46,8 @@ CHANGES * Issue #185: Applied patch and added regression tests for making svn tagging work on the new style SVN metadata. +* Prune revision control directories (e.g .svn) from base path + as well as subfolders. ----- 3.4.4 diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 6bb2ead9..be326ac2 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -316,7 +316,8 @@ class manifest_maker(sdist): self.filelist.exclude_pattern(None, prefix=build.build_base) self.filelist.exclude_pattern(None, prefix=base_dir) sep = re.escape(os.sep) - self.filelist.exclude_pattern(sep+r'(RCS|CVS|\.svn)'+sep, is_regex=1) + self.filelist.exclude_pattern(r'(^|'+sep+r')(RCS|CVS|\.svn)'+sep, + is_regex=1) def write_file(filename, contents): |