summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/fileutils.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e52985d09f..c991e1b23cb 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 775b2bb5356..0997b947357 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