summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-02-23 09:00:51 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-02-23 09:00:51 +0000
commit8d5ad9c1b30aac5db1230aa0c84c2634faa88891 (patch)
tree8352221ee18d07600267d3e155214a1cc02fc2e2
parenta068f1cc07c1aa4e844cf943502c225e715f8198 (diff)
* 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
-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