diff options
| -rw-r--r-- | debian/patches/check-for-dev-tty-before-using-it.patch | 27 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/check-for-dev-tty-before-using-it.patch b/debian/patches/check-for-dev-tty-before-using-it.patch new file mode 100644 index 000000000..92b0e3a87 --- /dev/null +++ b/debian/patches/check-for-dev-tty-before-using-it.patch @@ -0,0 +1,27 @@ +Description: Choose character device for "-c" testing more safely + Hopefully solves test suite failures on Hurd +Author: Pino Toscano <pino@debian.org> +Reviewed-By: Axel Beckert <abe@debian.org> + +Index: zsh/Test/C02cond.ztst +=================================================================== +--- zsh.orig/Test/C02cond.ztst 2013-09-20 16:21:32.000000000 +0200 ++++ zsh/Test/C02cond.ztst 2013-09-20 17:59:03.000000000 +0200 +@@ -41,9 +41,14 @@ + fi + 0D:-b cond + +- # Use hardcoded /dev/tty because globbing inside /dev fails on Cygwin +- char=/dev/tty +- [[ -c $char && ! -c $zerolength ]] ++ # Hardcoded /dev/tty as necessary for Cygwin may fail on Hurd ++ tty=$(find /dev/ -name 'tty*' -type c -print) ++ if [[ -n $tty ]]; then ++ [[ -c $tty[(f)1] && ! -c $zerolength ]] ++ else ++ print -u$ZTST_fd 'Warning: Not testing [[ -c tty ]] (no tty found)' ++ [[ ! -c $zerolength ]] ++ fi + 0:-c cond + + [[ -d . && ! -d zerolength ]] diff --git a/debian/patches/series b/debian/patches/series index 2ef5cb596..faf51dbe4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ texinfo_remove_leading_whitespace.patch vcs_info_guilt_support.patch replace-texi2html-with-makeinfo fix-segfault-in-compinit-get_cvdef +check-for-dev-tty-before-using-it.patch |