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

* da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method
git-mirror · Apr 23, 2010 · dd0c513 · dd0c513
2 parents f9dae0d + 0ae0840
commit dd0c513
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1560,9 +1560,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 $@+ && \