Bläddra i källkod

HADOOP-6505. Use tr rather than sed to effect literal substitution in the
build script. Contributed by Allen Wittenauer


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@909801 13f79535-47bb-0310-9956-ffa450edef68

Christopher Douglas 15 år sedan
förälder
incheckning
e0a0e6b9f5
2 ändrade filer med 6 tillägg och 2 borttagningar
  1. 3 0
      CHANGES.txt
  2. 3 2
      build.xml

+ 3 - 0
CHANGES.txt

@@ -186,6 +186,9 @@ Trunk (unreleased changes)
 
     HADOOP-6522. Fix decoding of codepoint zero in UTF8. (cutting)
 
+    HADOOP-6505. Use tr rather than sed to effect literal substitution in the
+    build script. (Allen Wittenauer via cdouglas)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

+ 3 - 2
build.xml

@@ -50,9 +50,10 @@
   <property name="build.webapps" value="${build.dir}/webapps"/>
 
   <!-- convert spaces to _ so that mac os doesn't break things -->
-  <exec executable="sed" inputstring="${os.name}" 
+  <exec executable="tr" inputstring="${os.name}" 
         outputproperty="nonspace.os">
-     <arg value="s/ /_/g"/>
+     <arg value="[:space:]"/>
+     <arg value="_"/>
   </exec>
   <property name="build.platform" 
             value="${nonspace.os}-${os.arch}-${sun.arch.data.model}"/>