From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 29 Jun 2018 16:05:06 +0000 (+0100)
Subject: test suite: gpg-agent workaround: Send ps output to stderr (oops)
X-Git-Tag: archive/debian/5.5+exp7^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0a9d7c678c2ef3a3dbe40c012f3a1b86a8ca3c2a;p=dgit.git

test suite: gpg-agent workaround: Send ps output to stderr (oops)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index 8076ac0d..36118450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dgit (5.5+exp7) experimental; urgency=medium
+
+  * test suite: gpg-agent workaround: Send ps output to stderr (oops)
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 29 Jun 2018 17:03:09 +0100
+
 dgit (5.5+exp6) experimental; urgency=medium
 
   * test suite: gpg-agent workaround: Cope if ps not found.
diff --git a/tests/tstunt/gpg-withagent b/tests/tstunt/gpg-withagent
index 3f56d085..4b2ee1a3 100755
--- a/tests/tstunt/gpg-withagent
+++ b/tests/tstunt/gpg-withagent
@@ -3,7 +3,7 @@ set -ex
 
 d () {
 	date --iso-8601=ns >&2
-	ps -ef | grep gpg-agent ||: >&2
+	ps -ef | grep gpg-agent >&2 ||:
 }
 
 d