Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 96704 invoked from network); 4 Apr 2008 18:32:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Apr 2008 18:32:18 -0000 Received: (qmail 92534 invoked by uid 500); 4 Apr 2008 18:32:18 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 92509 invoked by uid 500); 4 Apr 2008 18:32:18 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 92500 invoked by uid 99); 4 Apr 2008 18:32:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2008 11:32:18 -0700 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2008 18:31:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2013C1A9832; Fri, 4 Apr 2008 11:31:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r644814 - in /hadoop/core/trunk: CHANGES.txt src/java/org/apache/hadoop/fs/FsShell.java Date: Fri, 04 Apr 2008 18:31:54 -0000 To: core-commits@hadoop.apache.org From: rangadi@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080404183155.2013C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rangadi Date: Fri Apr 4 11:31:39 2008 New Revision: 644814 URL: http://svn.apache.org/viewvc?rev=644814&view=rev Log: HADOOP-3165. -put/-copyFromLocal did not treat input file - as stdin. (Lohit Vijayarenu via rangadi) Modified: hadoop/core/trunk/CHANGES.txt hadoop/core/trunk/src/java/org/apache/hadoop/fs/FsShell.java Modified: hadoop/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=644814&r1=644813&r2=644814&view=diff ============================================================================== --- hadoop/core/trunk/CHANGES.txt (original) +++ hadoop/core/trunk/CHANGES.txt Fri Apr 4 11:31:39 2008 @@ -482,6 +482,9 @@ HADOOP-3146. A DFSOutputStream.flush method is renamed as DFSOutputStream.fsync. (dhruba) + HADOOP-3165. -put/-copyFromLocal did not treat input file "-" as stdin. + (Lohit Vijayarenu via rangadi) + Release 0.16.2 - 2008-04-02 BUG FIXES Modified: hadoop/core/trunk/src/java/org/apache/hadoop/fs/FsShell.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/fs/FsShell.java?rev=644814&r1=644813&r2=644814&view=diff ============================================================================== --- hadoop/core/trunk/src/java/org/apache/hadoop/fs/FsShell.java (original) +++ hadoop/core/trunk/src/java/org/apache/hadoop/fs/FsShell.java Fri Apr 4 11:31:39 2008 @@ -128,22 +128,12 @@ void copyFromLocal(Path[] srcs, String dstf) throws IOException { Path dstPath = new Path(dstf); FileSystem dstFs = dstPath.getFileSystem(getConf()); - dstFs.copyFromLocalFile(false, false, srcs, dstPath); - } - - /** - * Add a local file to the indicated FileSystem name. src is kept. - */ - void copyFromLocal(Path src, String dstf) throws IOException { - if (src.toString().equals("-")) { - Path dstPath = new Path(dstf); - FileSystem dstFs = dstPath.getFileSystem(getConf()); + if (srcs.length == 1 && srcs[0].toString().equals("-")) copyFromStdin(dstPath, dstFs); - } else { - copyFromLocal(new Path[]{src}, dstf); - } + else + dstFs.copyFromLocalFile(false, false, srcs, dstPath); } - + /** * Add local files to the indicated FileSystem name. src is removed. */