svn commit: r1065902 - in /hadoop/common/branches/branch-0.22: CHANGES.txt src/java/org/apache/hadoop/fs/RawLocalFileSystem.java

[shv]

Author: shv
Date: Tue Feb  1 03:06:17 2011
New Revision: 1065902

URL: http://svn.apache.org/viewvc?rev=1065902&view=rev
Log:
HADOOP-7126. Merge -r 1065900:1065901 from trunk to branch 0.22.

Modified:
    hadoop/common/branches/branch-0.22/CHANGES.txt
    
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java

Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1065902&r1=1065901&r2=1065902&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Tue Feb  1 03:06:17 2011
@@ -407,6 +407,9 @@ Release 0.22.0 - Unreleased
 
     HADOOP-7122. Fix thread leak when shell commands time out. (todd)
 
+    HADOOP-7126. Fix file permission setting for RawLocalFileSystem on Windows.
+    (Po Cheung via shv)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: 
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java?rev=1065902&r1=1065901&r2=1065902&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java
 (original)
+++ 
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/RawLocalFileSystem.java
 Tue Feb  1 03:06:17 2011
@@ -556,7 +556,7 @@ public class RawLocalFileSystem extends 
   private static String execCommand(File f, String... cmd) throws IOException {
     String[] args = new String[cmd.length + 1];
     System.arraycopy(cmd, 0, args, 0, cmd.length);
-    args[cmd.length] = f.getCanonicalPath();
+    args[cmd.length] = FileUtil.makeShellPath(f, true);
     String output = Shell.execCommand(args);
     return output;
   }