diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-06 21:50:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-06 21:50:47 (GMT) |
| commit | b807c524df69fb44d7fe2a68a899985a7f7e6838 (patch) | |
| tree | f450071166fb2c29e5bd40ba5820e23b62df4b23 /Makefile | |
| parent | 4a8295f582ce6ea643dc113038d30a8e1e3f40b9 (diff) | |
| parent | 0ae08401beb0daef9946b6fe25224a4cf167c655 (diff) | |
| download | git-b807c524df69fb44d7fe2a68a899985a7f7e6838.zip git-b807c524df69fb44d7fe2a68a899985a7f7e6838.tar.gz git-b807c524df69fb44d7fe2a68a899985a7f7e6838.tar.bz2 | |
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-- | Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 $@+ && \ |