Commit 2f50e908 authored by Tim Peters's avatar Tim Peters

SF patch 959726: sdist versus SVN

The disutils sdist command now ignores .svn directories.
parent 92816de1
...@@ -1066,7 +1066,7 @@ fully processed the manifest template, we remove files that should not ...@@ -1066,7 +1066,7 @@ fully processed the manifest template, we remove files that should not
be included in the source distribution: be included in the source distribution:
\begin{itemize} \begin{itemize}
\item all files in the Distutils ``build'' tree (default \file{build/}) \item all files in the Distutils ``build'' tree (default \file{build/})
\item all files in directories named \file{RCS} or \file{CVS} \item all files in directories named \file{RCS}, \file{CVS} or \file{.svn}
\end{itemize} \end{itemize}
Now we have our complete list of files, which is written to the manifest 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 for future reference, and then used to build the source distribution
...@@ -1098,8 +1098,8 @@ Distutils source distribution: ...@@ -1098,8 +1098,8 @@ Distutils source distribution:
included by the previous two steps, so it's important that the included by the previous two steps, so it's important that the
\code{prune} command in the manifest template comes after the \code{prune} command in the manifest template comes after the
\code{recursive-include} command \code{recursive-include} command
\item exclude the entire \file{build} tree, and any \file{RCS} or \item exclude the entire \file{build} tree, and any \file{RCS},
\file{CVS} directories \file{CVS} and \file{.svn} directories
\end{enumerate} \end{enumerate}
Just like in the setup script, file and directory names in the manifest Just like in the setup script, file and directory names in the manifest
template should always be slash-separated; the Distutils will take care template should always be slash-separated; the Distutils will take care
......
...@@ -347,14 +347,14 @@ class sdist (Command): ...@@ -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 or CVS directories * any RCS, CVS and .svn 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)/.*', is_regex=1) self.filelist.exclude_pattern(r'/(RCS|CVS|\.svn)/.*', is_regex=1)
def write_manifest (self): def write_manifest (self):
......
...@@ -149,7 +149,7 @@ Core and builtins ...@@ -149,7 +149,7 @@ Core and builtins
over a sequence. over a sequence.
- Added a sorted() builtin function that returns a new sorted list - Added a sorted() builtin function that returns a new sorted list
from any iterable. from any iterable.
- CObjects are now mutable (on the C level) through PyCObject_SetVoidPtr. - CObjects are now mutable (on the C level) through PyCObject_SetVoidPtr.
...@@ -197,9 +197,9 @@ Core and builtins ...@@ -197,9 +197,9 @@ Core and builtins
- buffer objects based on other objects no longer cache a pointer to - buffer objects based on other objects no longer cache a pointer to
the data and the data length. Instead, the appropriate tp_as_buffer the data and the data length. Instead, the appropriate tp_as_buffer
method is called as necessary. method is called as necessary.
- fixed: if a file is opened with an explicit buffer size >= 1, repeated - fixed: if a file is opened with an explicit buffer size >= 1, repeated
close() calls would attempt to free() the buffer already free()ed on close() calls would attempt to free() the buffer already free()ed on
the first call. the first call.
...@@ -311,6 +311,10 @@ Extension modules ...@@ -311,6 +311,10 @@ Extension modules
Library Library
------- -------
- The distutils sdist command now ignores all .svn directories, in
addition to CVS and RCS directories. .svn directories hold
administrative files for the Subversion source control system.
- Added a new module: cookielib. Automatic cookie handling for HTTP - Added a new module: cookielib. Automatic cookie handling for HTTP
clients. Also, support for cookielib has been added to urllib2, so clients. Also, support for cookielib has been added to urllib2, so
urllib2.urlopen() can transparently handle cookies. urllib2.urlopen() can transparently handle cookies.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment