[Python-checkins] cpython (merge default -> default): Merge heads

Tue Jan 29 09:53:21 CET 2013

http://hg.python.org/cpython/rev/d2f502cf12f4
changeset: 81810:d2f502cf12f4
parent: 81806:218da678bb8b
parent: 81802:888590641c49
user: Serhiy Storchaka <storchaka at gmail.com>
date: Tue Jan 29 10:40:24 2013 +0200
summary:
 Merge heads
files:
 Mac/BuildScript/build-installer.py | 6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -192,7 +192,8 @@
 
 LT_10_5 = bool(DEPTARGET < '10.5')
 
- result.extend([
+ if getVersionTuple() >= (3, 3):
+ result.extend([
 dict(
 name="XZ 5.0.3",
 url="http://tukaani.org/xz/xz-5.0.3.tar.gz",
@@ -201,6 +202,9 @@
 '--disable-dependency-tracking',
 ]
 ),
+ ])
+
+ result.extend([
 dict(
 name="NCurses 5.9",
 url="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz",
-- 
Repository URL: http://hg.python.org/cpython
