From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 14 Mar 2012 22:17:31 +0000 (+0100)
Subject: merge 3.2
X-Git-Tag: v3.3.0a2~188^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ce31cc4fc9737ae9ddfe34c7c91297ffe74844a;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

5ce31cc4fc9737ae9ddfe34c7c91297ffe74844a
diff --cc Tools/scripts/patchcheck.py
index 0ca712ad31f3,0e18dd9356d4..503c67a027e7
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@@ -132,21 -148,6 +132,21 @@@ def reported_news(file_paths)
      """Check if Misc/NEWS has been changed."""
      return 'Misc/NEWS' in file_paths
  
 +@status("configure regenerated", modal=True, info=str)
 +def regenerated_configure(file_paths):
 +    """Check if configure has been regenerated."""
-     if 'configure.in' in file_paths:
++    if 'configure.ac' in file_paths:
 +        return "yes" if 'configure' in file_paths else "no"
 +    else:
 +        return "not needed"
 +
 +@status("pyconfig.h.in regenerated", modal=True, info=str)
 +def regenerated_pyconfig_h_in(file_paths):
 +    """Check if pyconfig.h.in has been regenerated."""
-     if 'configure.in' in file_paths:
++    if 'configure.ac' in file_paths:
 +        return "yes" if 'pyconfig.h.in' in file_paths else "no"
 +    else:
 +        return "not needed"
  
  def main():
      file_paths = changed_files()