Skip to content

Instantly share code, notes, and snippets.

@pcd1193182
Created April 15, 2016 18:41
Show Gist options
  • Save pcd1193182/c796d1ce559c10a974e7c9848cd12e73 to your computer and use it in GitHub Desktop.
Save pcd1193182/c796d1ce559c10a974e7c9848cd12e73 to your computer and use it in GitHub Desktop.
From 50d9cc58b8799deac0c43787b836f1dee5a06d60 Mon Sep 17 00:00:00 2001
From: Paul Dagnelie <pcd@delphix.com>
Date: Fri, 15 Apr 2016 11:39:27 -0700
Subject: [PATCH] fix
---
usr/src/tools/scripts/git-pbchk.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py
index ce016b6..92303f9 100644
--- a/usr/src/tools/scripts/git-pbchk.py
+++ b/usr/src/tools/scripts/git-pbchk.py
@@ -71,13 +71,13 @@ def git(command):
try:
p = subprocess.Popen(command,
stdout=tmpfile,
- stderr=subprocess.STDOUT)
+ stderr=subprocess.PIPE)
except OSError, e:
raise GitError("could not execute %s: %s\n" (command, e))
err = p.wait()
if err != 0:
- raise GitError(p.stdout.read())
+ raise GitError(p.stderr.read())
tmpfile.seek(0)
return tmpfile
--
2.6.4 (Apple Git-63)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment