diff options
| author | Brandon Casey <drafnel@gmail.com> | 2010-06-10 00:24:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-14 03:02:50 (GMT) |
| commit | 23b093ee087e99049585487f59e262a0e0662b6e (patch) | |
| tree | 9fcd50dbb19072e7a107f0f81cd1da4c5ecafc1b /git_remote_helpers/git/importer.py | |
| parent | ae45732214a092baa8b78a5cea462e4a7a538165 (diff) | |
| download | git-23b093ee087e99049585487f59e262a0e0662b6e.zip git-23b093ee087e99049585487f59e262a0e0662b6e.tar.gz git-23b093ee087e99049585487f59e262a0e0662b6e.tar.bz2 | |
Remove python 2.5'isms
The following python 2.5 features were worked around:
* the sha module is used as a fallback when the hashlib module is
not available
* the 'any' built-in method was replaced with a 'for' loop
* a conditional expression was replaced with an 'if' statement
* the subprocess.check_call method was replaced by a call to
subprocess.Popen followed by a call to subprocess.wait with a
check of its return status
These changes allow the python infrastructure to be used with python 2.4
which is distributed with RedHat's RHEL 5, for example.
t5800 was updated to check for python >= 2.4 to reflect these changes.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git_remote_helpers/git/importer.py')
| -rw-r--r-- | git_remote_helpers/git/importer.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git_remote_helpers/git/importer.py b/git_remote_helpers/git/importer.py index af2919d..70a7127 100644 --- a/git_remote_helpers/git/importer.py +++ b/git_remote_helpers/git/importer.py @@ -35,4 +35,6 @@ class GitImporter(object): if os.path.exists(path): args.append("--import-marks=" + path) - subprocess.check_call(args) + child = subprocess.Popen(args) + if child.wait() != 0: + raise CalledProcessError |