summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2008-10-21 07:11:36 -0700
committerShawn O. Pearce <sop@google.com>2008-10-21 07:12:42 -0700
commit7542d664de7a9d42f64a81bc8c0b86bcbb384376 (patch)
tree9a991d3c21b9f38cbd08f3c7d5852db0c3db2b5a
parent0734600ce0f24016d190311621ea59649bc92bad (diff)
downloadgit-repo-7542d664de7a9d42f64a81bc8c0b86bcbb384376.tar.gz
Remove the Python 2.4 dependency and use just 'python'v1.0.1
Many Linux distributions are including python2.5 by default, as it is the latest stable release of the language. Using python2.4 (and asking users to specifically install it) is just cruel and unusual punishment. Signed-off-by: Shawn O. Pearce <sop@google.com>
-rwxr-xr-xmain.py2
-rwxr-xr-xrepo4
2 files changed, 3 insertions, 3 deletions
diff --git a/main.py b/main.py
index 56092990..85c29417 100755
--- a/main.py
+++ b/main.py
@@ -15,7 +15,7 @@
15# limitations under the License. 15# limitations under the License.
16 16
17magic='--calling-python-from-/bin/sh--' 17magic='--calling-python-from-/bin/sh--'
18"""exec" python2.4 -E "$0" "$@" """#$magic" 18"""exec" python -E "$0" "$@" """#$magic"
19if __name__ == '__main__': 19if __name__ == '__main__':
20 import sys 20 import sys
21 if sys.argv[-1] == '#%s' % magic: 21 if sys.argv[-1] == '#%s' % magic:
diff --git a/repo b/repo
index d5f69fb2..18d0d7f4 100755
--- a/repo
+++ b/repo
@@ -20,7 +20,7 @@ REPO_REV='stable'
20# limitations under the License. 20# limitations under the License.
21 21
22magic='--calling-python-from-/bin/sh--' 22magic='--calling-python-from-/bin/sh--'
23"""exec" python2.4 -E "$0" "$@" """#$magic" 23"""exec" python -E "$0" "$@" """#$magic"
24if __name__ == '__main__': 24if __name__ == '__main__':
25 import sys 25 import sys
26 if sys.argv[-1] == '#%s' % magic: 26 if sys.argv[-1] == '#%s' % magic:
@@ -28,7 +28,7 @@ if __name__ == '__main__':
28del magic 28del magic
29 29
30# increment this whenever we make important changes to this script 30# increment this whenever we make important changes to this script
31VERSION = (1, 4) 31VERSION = (1, 5)
32 32
33# increment this if the MAINTAINER_KEYS block is modified 33# increment this if the MAINTAINER_KEYS block is modified
34KEYRING_VERSION = (1,0) 34KEYRING_VERSION = (1,0)