xorg-server: Changes to 'debian-unstable'
debian/changelog | 2 +-
debian/local/xvfb-run | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 48138e6b8baff773eb282d437edcb28e2affb2bc
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Mar 20 20:56:29 2012 +0100
Brown paper bag fix for the xvfb-run wait change
wait returns non-zero if interrupted by a signal, and we're set -e.
diff --git a/debian/changelog b/debian/changelog
index 5740ae8..529f717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ xorg-server (2:1.11.4-2) UNRELEASED; urgency=low
* xvfb-run: instead of waiting 3 seconds and hoping that's enough for Xvfb
to come up (and waiting 2.9 seconds too many in the general case), tell it
to send us SIGUSR1 when it's ready to accept connections. This reduces
- "xvfb-run -- xterm -e true" from 3.17s to 0.28s on a quick test.
+ "xvfb-run -- xterm -e true" from ~3.2s to ~0.4s on a quick test.
-- Julien Cristau <jcristau@debian.org> Mon, 19 Mar 2012 21:16:07 +0100
diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run
index 8832718..b708e63 100644
--- a/debian/local/xvfb-run
+++ b/debian/local/xvfb-run
@@ -164,7 +164,7 @@ EOF
(trap '' SIGUSR1; XAUTHORITY=$AUTHFILE exec Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" 2>&1) &
XVFBPID=$!
- wait
+ wait || :
if kill -0 $XVFBPID 2>/dev/null; then
break
elif [ -n "$AUTONUM" ]; then
Reply to: