aboutsummaryrefslogtreecommitdiff
path: root/contrib/p4import/git-p4import.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-09 08:25:47 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-09 08:25:48 -0800
commit48b7f524550ad46db95ec097e7f085160073a247 (patch)
treef46c13a0011afb2bd659011076721b1dc0cb154a /contrib/p4import/git-p4import.py
parent00f1a867b4dde5065a579286a4de880142548bb2 (diff)
parenta33faf2827bfc7baea5d83ef1be8fe659a963355 (diff)
downloadgit-48b7f524550ad46db95ec097e7f085160073a247.tar.gz
git-48b7f524550ad46db95ec097e7f085160073a247.tar.xz
Merge branch 'er/python-version-requirements'
Some python scripts we ship cannot be run with older versions of the interpreter. * er/python-version-requirements: Add checks to Python scripts for version dependencies.
Diffstat (limited to 'contrib/p4import/git-p4import.py')
-rw-r--r--contrib/p4import/git-p4import.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/p4import/git-p4import.py b/contrib/p4import/git-p4import.py
index b6e534b65..593d6a068 100644
--- a/contrib/p4import/git-p4import.py
+++ b/contrib/p4import/git-p4import.py
@@ -14,6 +14,11 @@ import sys
import time
import getopt
+if sys.hexversion < 0x02020000:
+ # The behavior of the marshal module changed significantly in 2.2
+ sys.stderr.write("git-p4import.py: requires Python 2.2 or later.\n")
+ sys.exit(1)
+
from signal import signal, \
SIGPIPE, SIGINT, SIG_DFL, \
default_int_handler