undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'da/maint-python-startup' into maint

Browse Source 
* da/maint-python-startup:
  Makefile: Remove usage of deprecated Python "has_key" method
This commit is contained in:
Junio C Hamano 2010-04-22 22:29:07 -07:00
commit dd0c5133c6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1560,9 +1560,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 $@+ && \