diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-28 21:36:33 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-28 21:36:33 -0400 |
| commit | 5d13194169ce785082a60233f2948f4eacbcedc9 (patch) | |
| tree | d6d47bb2f7650cba1be822777c05cdecbbb2d591 /setuptools/command/egg_info.py | |
| parent | fbf309d3e3b529f6ff0d57ecbb22514755b1154d (diff) | |
| parent | 0b70ebffe2c8cacc4c229c21286e74d0d2ebbd65 (diff) | |
| download | external_python_setuptools-5d13194169ce785082a60233f2948f4eacbcedc9.tar.gz external_python_setuptools-5d13194169ce785082a60233f2948f4eacbcedc9.tar.bz2 external_python_setuptools-5d13194169ce785082a60233f2948f4eacbcedc9.zip | |
Merge pull-request #575.3
--HG--
extra : amend_source : 9576c3d20e8d3bcb3b951cd2f588e782f885ebe6
Diffstat (limited to 'setuptools/command/egg_info.py')
| -rwxr-xr-x | setuptools/command/egg_info.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 981c7ab7..a1818edc 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -171,10 +171,10 @@ class egg_info(Command): version = '' if self.tag_build: version += self.tag_build - if self.tag_svn_revision and ( - os.path.exists('.svn') or os.path.exists('PKG-INFO') - ): - version += '-r%s' % self.get_svn_revision() + if self.tag_svn_revision: + rev = self.get_svn_revision() + if rev: # is 0 if it's not an svn working copy + version += '-r%s' % rev if self.tag_date: import time @@ -320,7 +320,7 @@ 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, + self.filelist.exclude_pattern(r'(^|' + sep + r')(RCS|CVS|\.svn)' + sep, is_regex=1) |