Andrew's git / gitweb.git / diff
?
Merge branch 'da/maint-python-startup'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:47 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:47 +0000 (14:50 -0700)
* da/maint-python-startup:
Makefile: Remove usage of deprecated Python "has_key" method

Makefile patch | blob | history
diff --git a/Makefile b/Makefile
index 9d850f49200c3611d054e0e96519675aef126a31..956e781622e732e3045b22776a761d4d95476a00 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 $@+ && \