aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-06 14:50:47 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-06 14:50:47 -0700
commitb807c524df69fb44d7fe2a68a899985a7f7e6838 (patch)
treef450071166fb2c29e5bd40ba5820e23b62df4b23 /Makefile
parent4a8295f582ce6ea643dc113038d30a8e1e3f40b9 (diff)
parent0ae08401beb0daef9946b6fe25224a4cf167c655 (diff)
downloadgit-b807c524df69fb44d7fe2a68a899985a7f7e6838.tar.gz
git-b807c524df69fb44d7fe2a68a899985a7f7e6838.tar.xz
Merge branch 'da/maint-python-startup'
* da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9d850f492..956e78162 100644
--- a/Makefile
+++ b/Makefile
@@ -1612,9 +1612,8 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
-e '}' \
-e 's|^import sys.*|&; \\\
import os; \\\
- sys.path[0] = os.environ.has_key("GITPYTHONLIB") and \\\
- os.environ["GITPYTHONLIB"] or \\\
- "@@INSTLIBDIR@@"|' \
+ sys.path.insert(0, os.getenv("GITPYTHONLIB",\
+ "@@INSTLIBDIR@@"));|' \
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
$@.py >$@+ && \
chmod +x $@+ && \