From 42db5c30331c0678702e16d5c6eb04b7c9a278b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= Date: Mon, 17 May 2010 11:04:41 +0000 Subject: [PATCH] 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 ........ ................ --- Doc/distutils/sourcedist.rst | 12 ++---------- Lib/distutils/command/sdist.py | 3 ++- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index 0c786c5a0a7..96e891bd68a 100644 --- a/Doc/distutils/sourcedist.rst +++ b/Doc/distutils/sourcedist.rst @@ -198,19 +198,11 @@ There are a couple of options that modify this behaviour. First, use the :option:`--no-defaults` and :option:`--no-prune` to disable the standard "include" and "exclude" sets. -Second, you might want to force the manifest to be regenerated---for example, if -you have added or removed files or directories that match an existing pattern in -the manifest template, you should regenerate the manifest:: - - python setup.py sdist --force-manifest - -Or, you might just want to (re)generate the manifest, but not create a source +Second, you might just want to (re)generate the manifest, but not create a source distribution:: python setup.py sdist --manifest-only -:option:`--manifest-only` implies :option:`--force-manifest`. :option:`-o` is a -shortcut for :option:`--manifest-only`, and :option:`-f` for -:option:`--force-manifest`. +:option:`-o` is a shortcut for :option:`--manifest-only`. diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py index 88fde46c30a..bb2106120ac 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',