From: Éric Araujo <merwok@netwok.org>
Date: Mon, 5 Sep 2011 15:45:48 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v2.7.3rc1~468
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab08da0a1c53c39b64d1ab36be2e067b990708ba;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

ab08da0a1c53c39b64d1ab36be2e067b990708ba
diff --cc Misc/NEWS
index b286f8b5827d,0778cad15fe6..2b6a8907cfc8
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -39,12 -39,10 +39,15 @@@ Core and Builtin
  
  Library
  -------
 -
++ 
+ - Issue #8286: The distutils command sdist will print a warning message instead
+   of crashing when an invalid path is given in the manifest template.
  
 +- Issue #12841: tarfile unnecessarily checked the existence of numerical user
 +  and group ids on extraction. If one of them did not exist the respective id
 +  of the current user (i.e. root) was used for the file and ownership
 +  information was lost.
 +
  - Issue #10946: The distutils commands bdist_dumb, bdist_wininst and bdist_msi
    now respect a --skip-build option given to bdist.