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.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index b386182..6548b2c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -93,6 +93,10 @@
Library
-------
+- Issue #8688: MANIFEST files created by distutils now include a magic
+ comment indicating they are generated. Manually maintained MANIFESTs
+ without this marker will not be overwritten or removed.
+
- Issue #7467: when reading a file from a ZIP archive, its CRC is checked
and a BadZipfile error is raised if it doesn't match (as used to be the
case in Python 2.5 and earlier).