#1725737: ignore other VC directories other than CVS and SVN's too.

This commit is contained in:
Georg Brandl 2008-03-06 06:47:18 +00:00
parent 1d136bb91e
commit 1df03405fc
2 changed files with 7 additions and 5 deletions

View file

@ -122,7 +122,8 @@ distribution:
* all files in the Distutils "build" tree (default :file:`build/`) * all files in the Distutils "build" tree (default :file:`build/`)
* all files in directories named :file:`RCS`, :file:`CVS` or :file:`.svn` * all files in directories named :file:`RCS`, :file:`CVS`, :file:`.svn`,
:file:`.hg`, :file:`.git`, :file:`.bzr` or :file:`_darcs`
Now we have our complete list of files, which is written to the manifest for Now we have our complete list of files, which is written to the manifest for
future reference, and then used to build the source distribution archive(s). future reference, and then used to build the source distribution archive(s).
@ -156,8 +157,9 @@ source distribution:
previous two steps, so it's important that the ``prune`` command in the manifest previous two steps, so it's important that the ``prune`` command in the manifest
template comes after the ``recursive-include`` command template comes after the ``recursive-include`` command
#. exclude the entire :file:`build` tree, and any :file:`RCS`, :file:`CVS` and #. exclude the entire :file:`build` tree, and any :file:`RCS`, :file:`CVS`,
:file:`.svn` directories :file:`.svn`, :file:`.hg`, :file:`.git`, :file:`.bzr` and :file:`_darcs`
directories
Just like in the setup script, file and directory names in the manifest template Just like in the setup script, file and directory names in the manifest template
should always be slash-separated; the Distutils will take care of converting should always be slash-separated; the Distutils will take care of converting

View file

@ -347,14 +347,14 @@ class sdist (Command):
* the build tree (typically "build") * the build tree (typically "build")
* the release tree itself (only an issue if we ran "sdist" * the release tree itself (only an issue if we ran "sdist"
previously with --keep-temp, or it aborted) previously with --keep-temp, or it aborted)
* any RCS, CVS and .svn directories * any RCS, CVS, .svn, .hg, .git, .bzr, _darcs directories
""" """
build = self.get_finalized_command('build') build = self.get_finalized_command('build')
base_dir = self.distribution.get_fullname() base_dir = self.distribution.get_fullname()
self.filelist.exclude_pattern(None, prefix=build.build_base) self.filelist.exclude_pattern(None, prefix=build.build_base)
self.filelist.exclude_pattern(None, prefix=base_dir) self.filelist.exclude_pattern(None, prefix=base_dir)
self.filelist.exclude_pattern(r'/(RCS|CVS|\.svn)/.*', is_regex=1) self.filelist.exclude_pattern(r'(^|/)(RCS|CVS|\.svn|\.hg|\.git|\.bzr|_darcs)/.*', is_regex=1)
def write_manifest (self): def write_manifest (self):