summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrey Borzenkov <bor@users.sourceforge.net>2001-05-26 08:41:01 +0000
committerAndrey Borzenkov <bor@users.sourceforge.net>2001-05-26 08:41:01 +0000
commit60df1f9eece3b0f9a03ef146f0d978c5768304e6 (patch)
tree9de84f854226a595ae1b40de89aa679e6b137182
parentff98487aa5a218271c6af14d5f0cd57db9d625a8 (diff)
downloadzsh-60df1f9eece3b0f9a03ef146f0d978c5768304e6.tar.gz
zsh-60df1f9eece3b0f9a03ef146f0d978c5768304e6.tar.xz
zsh-60df1f9eece3b0f9a03ef146f0d978c5768304e6.zip
14489: workaround for find bug on ReliantUNIX
-rw-r--r--ChangeLog5
-rw-r--r--Test/C02cond.ztst3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index de2e4854d..f27149c56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-26  Andrej Borsenkow <bor@zsh.org>
+
+	* 14489: Test/C02cond.ztst: workaround for (probably) find
+	bug on ReliantUNIX made visible by 14484.
+
 2001-05-25  Bart Schaefer  <schaefer@zsh.org>
 
 	* 14484: Test/C02cond.ztst: Print a warning and skip the -b test
diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst
index 2564ad125..aabbbf23a 100644
--- a/Test/C02cond.ztst
+++ b/Test/C02cond.ztst
@@ -27,7 +27,8 @@
 0:-a cond
 
   # Find a block special file system.  This is a little tricky.
-  if block=$(find /dev(|ices)/ -type b -print); then
+  block=$(find /dev(|ices)/ -type b -print 2> /dev/null)
+  if [[ -n $block ]]; then
     [[ -b $block[(f)1] && ! -b zerolength ]]
   else
     print -u8 'Warning: Not testing [[ -b blockdevice ]] (no devices found)'