diff --git a/ChangeLog b/ChangeLog index f6b6412e8..d029fdfda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-08-14 Jean Raby + + * OpenChange/GNUmakefile: use version_info[{0,1}] instead of + version_info.{major,minor} when checking for legacy version + of python since these named attributes where added in python2.7 + 2012-08-13 Wolfgang Sourdeau * OpenChange/MAPIStoreSOGo.m (sogo_properties_get_uri): removed diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile index 0db45e325..1174670b2 100644 --- a/OpenChange/GNUmakefile +++ b/OpenChange/GNUmakefile @@ -27,7 +27,7 @@ BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR) UNRTF_DIR = unrtf-$(UNRTF_VERSION) PYTHON = /usr/bin/python -PYTHON_IS_GOOD = $(shell $(PYTHON) -c 'from sys import version_info; a=version_info; print a.major == 2 and a.minor >= 6') +PYTHON_IS_GOOD = $(shell $(PYTHON) -c 'from sys import version_info; a=version_info; print a[0] == 2 and a[1] >= 6') ifeq (${PYTHON_IS_GOOD},False) PYTHON = /usr/bin/python2.6 endif