Merge -r 674776:674777 from trunk onto 0.18 branch. Fixes HADOOP-3703.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@674807 13f79535-47bb-0310-9956-ffa450edef68

src/contrib/hod/CHANGES.txt

@@ -50,6 +50,9 @@ Release 0.18.0 - Unreleased
     script.exitcode file when a cluster directory is specified as a relative
     path. (Vinod Kumar Vavilapalli via mahadev)
 
+    HADOOP-3703. Fixes logcondense.py to use the new format of hadoop dfs -lsr
+    command line output format. (Vinod Kumar Vavilapalli via yhemanth)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

src/contrib/hod/support/logcondense.py

@@ -126,7 +126,7 @@ def runcondense():
   toPurge = { }
   for line in stdout:
     try:
-      m = re.match("^(.*?)\s.*$", line)
+      m = re.match("^.*\s(.*)\n$", line)
       filename = m.group(1)
       # file name format: <prefix>/<user>/hod-logs/<jobid>/[0-1]-[jobtracker|tasktracker|datanode|namenode|]-hostname-YYYYMMDDtime-random.tar.gz
       # first strip prefix: