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
  ........
................
This commit is contained in:
Tarek Ziadé 2010-05-17 11:04:41 +00:00
parent dd4671a93e
commit 42db5c3033
2 changed files with 4 additions and 11 deletions

View File

@ -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 :option:`--no-defaults` and :option:`--no-prune` to disable the standard
"include" and "exclude" sets. "include" and "exclude" sets.
Second, you might want to force the manifest to be regenerated---for example, if Second, you might just want to (re)generate the manifest, but not create a source
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
distribution:: distribution::
python setup.py sdist --manifest-only python setup.py sdist --manifest-only
:option:`--manifest-only` implies :option:`--force-manifest`. :option:`-o` is a :option:`-o` is a shortcut for :option:`--manifest-only`.
shortcut for :option:`--manifest-only`, and :option:`-f` for
:option:`--force-manifest`.

View File

@ -63,7 +63,8 @@ class sdist(Command):
"just regenerate the manifest and then stop " "just regenerate the manifest and then stop "
"(implies --force-manifest)"), "(implies --force-manifest)"),
('force-manifest', 'f', ('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=', None,
"formats for source distribution (comma-separated list)"), "formats for source distribution (comma-separated list)"),
('keep-temp', 'k', ('keep-temp', 'k',