Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 99196 invoked from network); 14 Jul 2009 17:39:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Jul 2009 17:39:50 -0000 Received: (qmail 48628 invoked by uid 500); 14 Jul 2009 17:39:59 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 48572 invoked by uid 500); 14 Jul 2009 17:39:58 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 48563 invoked by uid 99); 14 Jul 2009 17:39:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jul 2009 17:39:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jul 2009 17:39:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 754FD2388965; Tue, 14 Jul 2009 17:39:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r793987 - in /hadoop/common/trunk: CHANGES.txt src/java/org/apache/hadoop/fs/FsShell.java Date: Tue, 14 Jul 2009 17:39:34 -0000 To: common-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090714173934.754FD2388965@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szetszwo Date: Tue Jul 14 17:39:33 2009 New Revision: 793987 URL: http://svn.apache.org/viewvc?rev=793987&view=rev Log: HADOOP-6145. Fix FsShell rm/rmr error messages when there is a FNFE. Contributed by Jakob Homan Modified: hadoop/common/trunk/CHANGES.txt hadoop/common/trunk/src/java/org/apache/hadoop/fs/FsShell.java Modified: hadoop/common/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=793987&r1=793986&r2=793987&view=diff ============================================================================== --- hadoop/common/trunk/CHANGES.txt (original) +++ hadoop/common/trunk/CHANGES.txt Tue Jul 14 17:39:33 2009 @@ -1014,6 +1014,9 @@ HADOOP-6139. Fix the FsShell help messages for rm and rmr. (Jakob Homan via szetszwo) + HADOOP-6145. Fix FsShell rm/rmr error messages when there is a FNFE. + (Jakob Homan via szetszwo) + Release 0.20.0 - 2009-04-15 INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/FsShell.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/FsShell.java?rev=793987&r1=793986&r2=793987&view=diff ============================================================================== --- hadoop/common/trunk/src/java/org/apache/hadoop/fs/FsShell.java (original) +++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/FsShell.java Tue Jul 14 17:39:33 2009 @@ -1110,7 +1110,16 @@ /* delete a file */ private void delete(Path src, FileSystem srcFs, boolean recursive, boolean skipTrash) throws IOException { - if (srcFs.isDirectory(src) && !recursive) { + FileStatus fs = null; + try { + fs = srcFs.getFileStatus(src); + } catch (FileNotFoundException fnfe) { + // Have to re-throw so that console output is as expected + throw new FileNotFoundException("cannot remove " + + src + ": No such file or directory."); + } + + if (fs.isDir() && !recursive) { throw new IOException("Cannot remove directory \"" + src + "\", use -rmr instead"); } @@ -1126,10 +1135,6 @@ if (srcFs.delete(src, true)) { System.out.println("Deleted " + src); } else { - if (!srcFs.exists(src)) { - throw new FileNotFoundException("cannot remove " - + src + ": No such file or directory."); - } throw new IOException("Delete failed " + src); } }