summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-13 05:55:27 +0000
committerkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-13 05:55:27 +0000
commit4e6681683f330019eafddae597171204f2cf107a (patch)
tree01fcf39f7fea5b82b7761fecea94bf3c7cada0b4
parent471742d6afd5d0d5e8f4a09570024cb56003f55f (diff)
* shell/command-processor.rb: undefined method `top_level_test' in
Shell#test. [ruby-list:45634] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/shell/command-processor.rb7
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c7d23dba7..7a9490036e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 13 14:51:34 2008 Keiju Ishitsuka <keiju@ruby-lang.org>
+
+ * shell/command-processor.rb: undefined method `top_level_test' in
+ Shell#test. [ruby-list:45634]
+
Wed Nov 12 03:49:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (load_lock): makes circular require deadlock.
diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb
index ecf6c7d5eb..b0e4fb70db 100644
--- a/lib/shell/command-processor.rb
+++ b/lib/shell/command-processor.rb
@@ -155,6 +155,7 @@ class Shell
# sh[:exists?, "foo"]
# sh["exists?", "foo"]
#
+ alias top_level_test test
def test(command, file1, file2=nil)
file1 = expand_path(file1)
file2 = expand_path(file2) if file2
@@ -162,7 +163,11 @@ class Shell
case command
when Integer
- top_level_test(command, file1, file2)
+ if file2
+ top_level_test(command, file1, file2)
+ else
+ top_level_test(command, file1)
+ end
when String
if command.size == 1
if file2