[Python-checkins] r81264 - in python/branches/release31-maint: Doc/distutils/sourcedist.rst Lib/distutils/command/sdist.py

[tarek.ziade]

Author: tarek.ziade
Date: Mon May 17 13:04:41 2010
New Revision: 81264

Log:
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
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/distutils/sourcedist.rst
   python/branches/release31-maint/Lib/distutils/command/sdist.py

Modified: python/branches/release31-maint/Doc/distutils/sourcedist.rst
==============================================================================
--- python/branches/release31-maint/Doc/distutils/sourcedist.rst	(original)
+++ python/branches/release31-maint/Doc/distutils/sourcedist.rst	Mon May 17 13:04:41 2010
@@ -198,19 +198,11 @@
 :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`.
 
 

Modified: python/branches/release31-maint/Lib/distutils/command/sdist.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/command/sdist.py	(original)
+++ python/branches/release31-maint/Lib/distutils/command/sdist.py	Mon May 17 13:04:41 2010
@@ -63,7 +63,8 @@
          "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',