Merge branch 'da/maint-python-startup'

* da/maint-python-startup:
  Makefile: Remove usage of deprecated Python "has_key" method
This commit is contained in:
Junio C Hamano 2010-04-06 14:50:47 -07:00
commit b807c524df

View File

@ -1612,9 +1612,8 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
-e '}' \ -e '}' \
-e 's|^import sys.*|&; \\\ -e 's|^import sys.*|&; \\\
import os; \\\ import os; \\\
sys.path[0] = os.environ.has_key("GITPYTHONLIB") and \\\ sys.path.insert(0, os.getenv("GITPYTHONLIB",\
os.environ["GITPYTHONLIB"] or \\\ "@@INSTLIBDIR@@"));|' \
"@@INSTLIBDIR@@"|' \
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \ -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
$@.py >$@+ && \ $@.py >$@+ && \
chmod +x $@+ && \ chmod +x $@+ && \