diff options
author | Éric Araujo <merwok@netwok.org> | 2010-08-14 03:07:46 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2010-08-14 03:07:46 (GMT) |
commit | 0389ae60fa4d02316b8c0d011f6c399d55f998bc (patch) | |
tree | 9ec0b09bf4b1f533109ee83ebac91689850f718a /Doc | |
parent | e8c4920e4cd0f652036127709c02d2147596ba76 (diff) | |
download | cpython-0389ae60fa4d02316b8c0d011f6c399d55f998bc.zip cpython-0389ae60fa4d02316b8c0d011f6c399d55f998bc.tar.gz cpython-0389ae60fa4d02316b8c0d011f6c399d55f998bc.tar.bz2 |
Merged revisions 83993 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83993 | eric.araujo | 2010-08-14 04:30:34 +0200 (sam., 14 août 2010) | 2 lines
Use a marker in generated MANIFEST files, don't touch files without it. Fixes #8688.
........
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/distutils/sourcedist.rst | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index 2cfdf69..739964e 100644 --- a/Doc/distutils/sourcedist.rst +++ b/Doc/distutils/sourcedist.rst @@ -162,6 +162,10 @@ This mechanism can be used when the default list of files is not enough. Principle --------- +.. versionadded:: 2.7 + :file:`MANIFEST` files start with a comment indicated they are generated. + Files without this comment are not overwritten or removed. + The manifest template has one command per line, where each command specifies a set of files to include or exclude from the source distribution. For an example, let's look at the Distutils' own manifest template:: @@ -268,3 +272,7 @@ character, and ``[range]`` matches any of the characters in *range* (e.g., character" is platform-specific: on Unix it is anything except slash; on Windows anything except backslash or colon. +.. versionchanged:: 2.7 + An existing generated :file:`MANIFEST` will be regenerated without + :command:`sdist` comparing its modification time to the one of + :file:`MANIFEST.in` or :file:`setup.py`. |