From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Apr 2010 05:29:07 +0000 (-0700)
Subject: Merge branch 'da/maint-python-startup' into maint
X-Git-Tag: v1.7.0.6~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dd0c5133c6994d2930485c579e701d79df632ded?ds=inline;hp=-c

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

* da/maint-python-startup:
Makefile: Remove usage of deprecated Python "has_key" method
---

dd0c5133c6994d2930485c579e701d79df632ded
diff --combined Makefile
index e57d9754e2,2f55649b6f..5b86806606
--- a/Makefile
+++ b/Makefile
@@@ -831,7 -831,6 +831,7 @@@ ifeq ($(uname_S),FreeBSD
  		NO_UINTMAX_T = YesPlease
  		NO_STRTOUMAX = YesPlease
  	endif
 +	PYTHON_PATH = /usr/local/bin/python
  endif
  ifeq ($(uname_S),OpenBSD)
  	NO_STRCASESTR = YesPlease
@@@ -887,7 -886,6 +887,7 @@@ ifeq ($(uname_S),IRIX
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH = /usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
 +	NEEDS_LIBICONV = YesPlease
  endif
  ifeq ($(uname_S),IRIX64)
  	NO_SETENV=YesPlease
@@@ -906,7 -904,6 +906,7 @@@
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH=/usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
 +	NEEDS_LIBICONV = YesPlease
  endif
  ifeq ($(uname_S),HP-UX)
  	NO_IPV6=YesPlease
@@@ -1560,9 -1557,8 +1560,8 @@@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % 
  	    -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 $@+ && \