summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Thiem <ptthiem@gmail.com>2014-04-23 21:54:27 -0500
committerPhilip Thiem <ptthiem@gmail.com>2014-04-23 21:54:27 -0500
commita44aa46d3ebea80c6e3722d27d6fc50199c288a5 (patch)
tree878ca1882d89e0a16e0fb8b4e53d405a8906fa87
parent86bc49ff21049b26015e4281c79ed70eac2d441e (diff)
downloadpython-setuptools-bitbucket-a44aa46d3ebea80c6e3722d27d6fc50199c288a5.tar.gz
Prune paths file list starting with (RCS|CVS|.svn) as well as path with
such sub directories.
-rw-r--r--CHANGES.txt2
-rwxr-xr-xsetuptools/command/egg_info.py3
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):