diff options
| author | Georg Brandl <georg@python.org> | 2008-03-06 06:47:18 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-03-06 06:47:18 (GMT) |
| commit | 1df03405fc30604e00d506ac0f8c112517d8526e (patch) | |
| tree | 8ffdb8c3d498a7b8c0882029d6fdefb09af0d8f4 | |
| parent | 1d136bb91ee0e8a13f94fc456d7488fe3c3ef795 (diff) | |
| download | cpython-1df03405fc30604e00d506ac0f8c112517d8526e.zip cpython-1df03405fc30604e00d506ac0f8c112517d8526e.tar.gz cpython-1df03405fc30604e00d506ac0f8c112517d8526e.tar.bz2 | |
#1725737: ignore other VC directories other than CVS and SVN's too.
| -rw-r--r-- | Doc/distutils/sourcedist.rst | 8 | ||||
| -rw-r--r-- | Lib/distutils/command/sdist.py | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index 9f15870..960cc0a 100644 --- a/Doc/distutils/sourcedist.rst +++ b/Doc/distutils/sourcedist.rst @@ -122,7 +122,8 @@ distribution: * 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 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 template comes after the ``recursive-include`` command -#. exclude the entire :file:`build` tree, and any :file:`RCS`, :file:`CVS` and - :file:`.svn` directories +#. exclude the entire :file:`build` tree, and any :file:`RCS`, :file:`CVS`, + :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 should always be slash-separated; the Distutils will take care of converting diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py index 9b37f78..961256c 100644 --- a/Lib/distutils/command/sdist.py +++ b/Lib/distutils/command/sdist.py @@ -347,14 +347,14 @@ class sdist (Command): * the build tree (typically "build") * the release tree itself (only an issue if we ran "sdist" 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') base_dir = self.distribution.get_fullname() self.filelist.exclude_pattern(None, prefix=build.build_base) 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): |