merge revision(s) 20231:

	* shell/command-processor.rb: undefined method `top_level_test' in


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 15 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index aa6f2eab21..b006e2f9ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 13 19:04:06 2009  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* shell/command-processor.rb: undefined method `top_level_test' in
+  	  Shell#test. [ruby-list:45634]
+
 Tue Feb 10 19:57:43 2009  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
diff --git a/version.h b/version.h
index 4d6fed2346..0c2a3e5d3a 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-02-11"
+#define RUBY_RELEASE_DATE "2009-02-13"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090211
-#define RUBY_PATCHLEVEL 328
+#define RUBY_RELEASE_CODE 20090213
+#define RUBY_PATCHLEVEL 329
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 13
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];