diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-06 14:50:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-06 14:50:47 -0700 |
| commit | b807c524df69fb44d7fe2a68a899985a7f7e6838 (patch) | |
| tree | f450071166fb2c29e5bd40ba5820e23b62df4b23 | |
| parent | Merge branch 'ic/bash-completion-rpm' (diff) | |
| parent | Makefile: Remove usage of deprecated Python "has_key" method (diff) | |
| download | tgif-b807c524df69fb44d7fe2a68a899985a7f7e6838.tar.xz | |
Merge branch 'da/maint-python-startup'
* da/maint-python-startup:
Makefile: Remove usage of deprecated Python "has_key" method
| -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 $@+ && \ |