diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-07-30 18:55:21 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-07-30 18:55:21 +0000 |
| commit | 3f12efe73c075bbfe7e254714e8fabfb50f86af0 (patch) | |
| tree | f429351c58a9955c46f03b8789bce1e152d32660 /usr/src/tools/scripts/git-pbchk.py | |
| parent | 2453263d59c2317dbe88d1c9e12893a32abd91b8 (diff) | |
| parent | 5ada8a07255938930de285f1d55b0ef0bdba90ff (diff) | |
| download | illumos-joyent-3f12efe73c075bbfe7e254714e8fabfb50f86af0.tar.gz | |
Illumos Sync
Merge github.com:illumos/illumos-gate
Conflicts:
exception_lists/check_rtime
usr/src/Makefile.master
usr/src/Makefile.master.64
usr/src/cmd/Makefile
usr/src/cmd/lms/Makefile
usr/src/cmd/lp/Makefile.lp
usr/src/cmd/mdb/Makefile.mdb
usr/src/cmd/mdb/common/mdb/mdb_cmds.c
usr/src/cmd/mdb/common/mdb/mdb_print.c
usr/src/cmd/mdb/common/mdb/mdb_print.h
usr/src/cmd/mdb/common/mdb/mdb_tab.c
usr/src/cmd/mdb/common/mdb/mdb_termio.c
usr/src/cmd/mdb/common/mdb/mdb_whatis.c
usr/src/cmd/svc/svccfg/svccfg_libscf.c
usr/src/cmd/zpool/zpool_main.c
usr/src/lib/Makefile
usr/src/lib/libc/inc/thr_inlines.h
usr/src/lib/libc/port/mapfile-vers
usr/src/lib/libc/sparc/Makefile.com
usr/src/lib/libc/sparc/crt/_rtld.c
usr/src/lib/libc/sparcv9/Makefile.com
usr/src/lib/libdtrace/common/dt_open.c
usr/src/lib/libdtrace/common/dt_options.c
usr/src/lib/libumem/common/envvar.c
usr/src/lib/libumem/common/vmem_base.c
usr/src/lib/libzfs/common/libzfs_impl.h
usr/src/lib/libzfs/common/libzfs_iter.c
usr/src/lib/libzfs/common/libzfs_util.c
usr/src/lib/libzfs/common/mapfile-vers
usr/src/lib/sun_fc/Makefile.com
usr/src/lib/sun_fc/amd64/Makefile
usr/src/lib/sun_fc/sparcv9/Makefile
usr/src/man/man1m/Makefile
usr/src/uts/common/Makefile.files
usr/src/uts/common/dtrace/dtrace.c
usr/src/uts/common/fs/zfs/arc.c
usr/src/uts/common/fs/zfs/dmu.c
usr/src/uts/common/fs/zfs/dsl_dataset.c
usr/src/uts/common/fs/zfs/dsl_pool.c
usr/src/uts/common/fs/zfs/sys/zio.h
usr/src/uts/common/io/fibre-channel/fca/fcoei/fcoei_eth.c
usr/src/uts/common/io/fibre-channel/fca/fcoei/fcoei_lv.c
usr/src/uts/common/sys/dtrace.h
Diffstat (limited to 'usr/src/tools/scripts/git-pbchk.py')
| -rw-r--r-- | usr/src/tools/scripts/git-pbchk.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py index 59af2f3832..74be6a4818 100644 --- a/usr/src/tools/scripts/git-pbchk.py +++ b/usr/src/tools/scripts/git-pbchk.py @@ -24,6 +24,7 @@ import os import re import subprocess import sys +import tempfile from cStringIO import StringIO @@ -62,15 +63,24 @@ def git(command): command = ["git"] + command - p = subprocess.Popen(command, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) + try: + tmpfile = tempfile.TemporaryFile(prefix="git-nits") + except EnvironmentError, e: + raise GitError("Could not create temporary file: %s\n" % e) + + try: + p = subprocess.Popen(command, + stdout=tmpfile, + stderr=subprocess.STDOUT) + except OSError, e: + raise GitError("could not execute %s: %s\n" (command, e)) err = p.wait() if err != 0: raise GitError(p.stdout.read()) - return p.stdout + tmpfile.seek(0) + return tmpfile def git_root(): |