瀏覽代碼

HADOOP-10088. Merging change r1540270 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540271 13f79535-47bb-0310-9956-ffa450edef68
Chris Nauroth 11 年之前
父節點
當前提交
b13c6bda43
共有 2 個文件被更改,包括 5 次插入2 次删除
  1. 3 0
      hadoop-common-project/hadoop-common/CHANGES.txt
  2. 2 2
      hadoop-project-dist/pom.xml

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -129,6 +129,9 @@ Release 2.3.0 - UNRELEASED
     HADOOP-9016. HarFsInputStream.skip(long) must never return negative value.
     (Ivan A. Veselovsky via jeagles)
 
+    HADOOP-10088. copy-nativedistlibs.sh needs to quote snappy lib dir.
+    (Raja Aluri via cnauroth)
+
 Release 2.2.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

+ 2 - 2
hadoop-project-dist/pom.xml

@@ -346,7 +346,7 @@
                         cd $${LIB_DIR}
                         $$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR)
                         if [ "${bundle.snappy}" = "true" ] ; then
-                          cd ${snappy.lib}
+                          cd "${snappy.lib}"
                           $$TAR *snappy* | (cd $${TARGET_DIR}/; $$UNTAR)
                         fi
                       fi
@@ -358,7 +358,7 @@
                         $$TAR * | (cd $${TARGET_BIN_DIR}/; $$UNTAR)
                         if [ "${bundle.snappy.in.bin}" = "true" ] ; then
                           if [ "${bundle.snappy}" = "true" ] ; then
-                            cd ${snappy.lib}
+                            cd "${snappy.lib}"
                             $$TAR *snappy* | (cd $${TARGET_BIN_DIR}/; $$UNTAR)
                           fi
                         fi