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 cu...@apache.org on 2007/08/15 22:49:10 UTC
svn commit: r566339 -
/lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java
Author: cutting
Date: Wed Aug 15 13:49:10 2007
New Revision: 566339
URL: http://svn.apache.org/viewvc?view=rev&rev=566339
Log:
Merge -r 566336:566337 from trunk to 0.14 branch. Fixes: HADOOP-1717.
Modified:
lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java
Modified: lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java?view=diff&rev=566339&r1=566338&r2=566339
==============================================================================
--- lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java (original)
+++ lucene/hadoop/branches/branch-0.14/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java Wed Aug 15 13:49:10 2007
@@ -68,10 +68,10 @@
if ( dfsDir.exists() && !FileUtil.fullyDelete(dfsDir) ) {
throw new IOException("Could not delete dfs directory '" + dfsDir + "'");
}
- String cmd = "bash -c \"gzip -dc '" + FileUtil.makeShellPath(tarFile) + "' | (cd '" +
- FileUtil.makeShellPath(dataDir) + "' ; tar -xf -)\"";
+ String cmd = "gzip -dc '" + FileUtil.makeShellPath(tarFile) + "' | (cd '" +
+ FileUtil.makeShellPath(dataDir) + "' ; tar -xf -)";
LOG.info("Unpacking the tar file. Cmd : " + cmd);
- String[] shellCmd = { "sh", "-c", cmd };
+ String[] shellCmd = { "bash", "-c", cmd };
Command.execCommand(shellCmd);
//Now read the reference info