Commit ddeaecbe authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'stable' into devel

parents 3cf994b1 189f46a3
......@@ -19,7 +19,7 @@ rm -f ${DOT_ORIG_WHITELIST_DELETE}
DOT_ORIG_FILES=$(find / -type f -name *.orig || :)
if [ "$DOT_ORIG_FILES" != "$DOT_ORIG_WHITELIST_KEEP" ]; then
echo "Some patches are fuzzy and leave .orig files around:" >&2
echo "E: Some patches are fuzzy and leave .orig files around:" >&2
echo "$DOT_ORIG_FILES" >&2
exit 1
fi
......@@ -142,7 +142,10 @@ next_free_display() {
}
test_suite_cleanup() {
(kill -0 ${XVFB_PID} 2>/dev/null && kill ${XVFB_PID}) || /bin/true
if [ -n "${XVFB_PID:-}" ]; then
(kill -0 ${XVFB_PID} 2>/dev/null && kill ${XVFB_PID}) || /bin/true
fi
return $?
}
start_xvfb() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment