summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2010-05-17 11:04:41 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2010-05-17 11:04:41 (GMT)
commit42db5c30331c0678702e16d5c6eb04b7c9a278b5 (patch)
tree80187ac2da9faf0d84c2c67c325203fcee9f79aa /Lib/distutils
parentdd4671a93eee8d4a9d121bb1b44bffb11c083560 (diff)
downloadcpython-42db5c30331c0678702e16d5c6eb04b7c9a278b5.zip
cpython-42db5c30331c0678702e16d5c6eb04b7c9a278b5.tar.gz
cpython-42db5c30331c0678702e16d5c6eb04b7c9a278b5.tar.bz2
Merged revisions 81263 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81263 | tarek.ziade | 2010-05-17 13:01:57 +0200 (Mon, 17 May 2010) | 9 lines Merged revisions 81261 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81261 | tarek.ziade | 2010-05-17 12:54:43 +0200 (Mon, 17 May 2010) | 1 line upgraded distutils docs w.r.t. the manifest regeneration ........ ................
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/command/sdist.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py
index 88fde46..bb21061 100644
--- a/Lib/distutils/command/sdist.py
+++ b/Lib/distutils/command/sdist.py
@@ -63,7 +63,8 @@ class sdist(Command):
"just regenerate the manifest and then stop "
"(implies --force-manifest)"),
('force-manifest', 'f',
- "forcibly regenerate the manifest and carry on as usual"),
+ "forcibly regenerate the manifest and carry on as usual. "
+ "Deprecated: now the manifest is always regenerated."),
('formats=', None,
"formats for source distribution (comma-separated list)"),
('keep-temp', 'k',