From 00272963ef7541b43dfb498d85d4da38ba813b83 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 31 Mar 2016 09:21:59 +0100 Subject: [PATCH] debian/rules: clean up stale gpg-agent processes after testing --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index af52d2d0..18541046 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ostree (2016.4-1) UNRELEASED; urgency=medium * Fix ITP bug number in changelog (was #813308, should have been #697477) * debian/control: build-depend on attr, for the tests (only required if /var/tmp supports extended attributes) + * debian/rules: clean up stale gpg-agent processes after testing * debian/rules: warn if there are leftover daemon processes after testing * debian/patches: add patches to get the build-time tests passing under sbuild diff --git a/debian/rules b/debian/rules index 38f748e5..e999af75 100755 --- a/debian/rules +++ b/debian/rules @@ -26,6 +26,8 @@ override_dh_auto_configure: override_dh_auto_test: dh_auto_test + # One test creates multiple GPG homedirs, each with its own agent + pkill --full "gpg-agent --homedir /var/tmp/tap-test\\.[^/]+/repo/tmp/ostree-gpg-[^/]+ " || : if pgrep lt-ostree || pgrep --full "gpg-agent --homedir /var/tmp/tap-test."; then \ echo "WARNING: daemon processes were leaked"; \ pgrep gpg-agent | xargs --no-run-if-empty ps ww; \