You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by gk...@apache.org on 2011/09/10 00:37:35 UTC
svn commit: r1167379 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt src/packages/update-hadoop-env.sh
Author: gkesavan
Date: Fri Sep 9 22:37:35 2011
New Revision: 1167379
URL: http://svn.apache.org/viewvc?rev=1167379&view=rev
Log:
HADOOP-7610. Fix for hadoop debian package. Contributed by Eric Yang
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/packages/update-hadoop-env.sh
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1167379&r1=1167378&r2=1167379&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Fri Sep 9 22:37:35 2011
@@ -329,6 +329,8 @@ Release 0.20.204.0 - 2011-8-25
HDFS-2218. Disable TestHdfsProxy.testHdfsProxyInterface in automated test
suite for 0.20-security-204 release. (Matt Foley)
+
+ HADOOP-7610. Fix for hadoop debian package (Eric Yang via gkesavan)
IMPROVEMENTS
Modified: hadoop/common/branches/branch-0.20-security/src/packages/update-hadoop-env.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/packages/update-hadoop-env.sh?rev=1167379&r1=1167378&r2=1167379&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/packages/update-hadoop-env.sh (original)
+++ hadoop/common/branches/branch-0.20-security/src/packages/update-hadoop-env.sh Fri Sep 9 22:37:35 2011
@@ -133,7 +133,9 @@ if [ "${UNINSTALL}" -eq "1" ]; then
rm -rf ${PREFIX}/etc/hadoop
fi
rm -f /etc/default/hadoop-env.sh
- rm -f /etc/profile.d/hadoop-env.sh
+ if [ -d /etc/profile.d ]; then
+ rm -f /etc/profile.d/hadoop-env.sh
+ fi
else
# Create symlinks
if [ "${CONF_DIR}" != "${PREFIX}/etc/hadoop" ]; then
@@ -141,7 +143,9 @@ else
ln -sf ${CONF_DIR} ${PREFIX}/etc/hadoop
fi
ln -sf ${CONF_DIR}/hadoop-env.sh /etc/default/hadoop-env.sh
- ln -sf ${CONF_DIR}/hadoop-env.sh /etc/profile.d/hadoop-env.sh
+ if [ -d /etc/profile.d ]; then
+ ln -sf ${CONF_DIR}/hadoop-env.sh /etc/profile.d/hadoop-env.sh
+ fi
mkdir -p ${LOG_DIR}
chown root:hadoop ${LOG_DIR}