Author: cutting Date: Wed Aug 15 13:47:41 2007 New Revision: 566337 URL: http://svn.apache.org/viewvc?view=rev&rev=566337 Log: HADOOP-1717. Simpler fix that also works on Windows.
Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java?view=diff&rev=566337&r1=566336&r2=566337 ============================================================================== --- lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java (original) +++ lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/TestDFSUpgradeFromImage.java Wed Aug 15 13:47:41 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