diff options
| author | Sverre Rabbelier <srabbelier@gmail.com> | 2011-07-16 13:03:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-19 18:17:47 (GMT) |
| commit | 460d10262dae14b54123ff45e7548d872ff63983 (patch) | |
| tree | e1c53cb7ea5fdf097d80bf305731affdc7e09142 /git_remote_helpers/git/importer.py | |
| parent | 0fb56ce716090248ed4895aff69dd3953b00882f (diff) | |
| download | git-460d10262dae14b54123ff45e7548d872ff63983.zip git-460d10262dae14b54123ff45e7548d872ff63983.tar.gz git-460d10262dae14b54123ff45e7548d872ff63983.tar.bz2 | |
git-remote-testgit: fix error handling
If fast-export did not complete successfully the error handling code
itself would error out.
This was broken in commit 23b093ee0 (Brandon Casey, Wed Jun 9 2010,
Remove python 2.5'isms). Revert that commit an introduce our own copy
of check_call in util.py instead.
Tested by changing 'if retcode' to 'if not retcode' temporarily.
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Acked-by: Jeff King <peff@peff.net>
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git_remote_helpers/git/importer.py b/git_remote_helpers/git/importer.py index 70a7127..02a719a 100644 --- a/git_remote_helpers/git/importer.py +++ b/git_remote_helpers/git/importer.py @@ -1,6 +1,8 @@ import os import subprocess +from git_remote_helpers.util import check_call + class GitImporter(object): """An importer for testgit repositories. @@ -35,6 +37,4 @@ class GitImporter(object): if os.path.exists(path): args.append("--import-marks=" + path) - child = subprocess.Popen(args) - if child.wait() != 0: - raise CalledProcessError + check_call(args) |