From 8d5ad9c1b30aac5db1230aa0c84c2634faa88891 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 23 Feb 2003 09:00:51 +0000
Subject: * lib/fileutils (fu_stream_blksize): wrong logial condition.   (and
 -> or).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        | 5 +++++
 lib/fileutils.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0e52985d09..c991e1b23c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 23 17:57:06 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/fileutils (fu_stream_blksize): wrong logial condition.
+	  (and -> or).
+
 Sat Feb 22 02:45:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_thread_create): may called from place higher than
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 775b2bb535..0997b94735 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -725,7 +725,7 @@ module FileUtils
     streams.each do |s|
       next unless s.respond_to?(:stat)
       size = s.stat.blksize
-      return size unless size.nil? and size.zero?
+      return size unless size.nil? or size.zero?
     end
     1024
   end
-- 
cgit v1.2.3