Return-Path: Delivered-To: apmail-maven-wagon-commits-archive@www.apache.org Received: (qmail 74980 invoked from network); 4 Jan 2006 08:19:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Jan 2006 08:19:00 -0000 Received: (qmail 18786 invoked by uid 500); 4 Jan 2006 08:19:00 -0000 Delivered-To: apmail-maven-wagon-commits-archive@maven.apache.org Received: (qmail 18761 invoked by uid 500); 4 Jan 2006 08:19:00 -0000 Mailing-List: contact wagon-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list wagon-commits@maven.apache.org Received: (qmail 18750 invoked by uid 99); 4 Jan 2006 08:19:00 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2006 00:19:00 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 04 Jan 2006 00:18:59 -0800 Received: (qmail 73868 invoked by uid 65534); 4 Jan 2006 08:18:49 -0000 Message-ID: <20060104081849.73866.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r365861 - /maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java Date: Wed, 04 Jan 2006 08:18:49 -0000 To: wagon-commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: brett Date: Wed Jan 4 00:18:44 2006 New Revision: 365861 URL: http://svn.apache.org/viewcvs?rev=365861&view=rev Log: reduce operations necessary for fileMode Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java?rev=365861&r1=365860&r2=365861&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java (original) +++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java Wed Jan 4 00:18:44 2006 @@ -102,6 +102,8 @@ String path = getPath( basedir, resourceName ); + RepositoryPermissions permissions = getRepository().getPermissions(); + try { // exec 'scp -t rfile' remotely @@ -125,7 +127,21 @@ // send "C0644 filesize filename", where filename should not include '/' long filesize = source.length(); - command = "C0644 " + filesize + " "; + String mode = "644"; + if ( permissions != null && permissions.getFileMode() != null ) + { + if ( permissions.getFileMode().matches( "/[0-9]{3}/" ) ) + { + mode = permissions.getFileMode(); + } + else + { + // TODO: as warning + fireSessionDebug( "Not using non-octal permissions: " + mode ); + } + } + + command = "C0" + mode + " " + filesize + " "; if ( resourceName.lastIndexOf( PATH_SEPARATOR ) > 0 ) { @@ -176,17 +192,9 @@ try { - RepositoryPermissions permissions = getRepository().getPermissions(); - if ( permissions != null && permissions.getGroup() != null ) { executeCommand( "chgrp -f " + permissions.getGroup() + " " + path ); - } - - // TODO: could avoid this by replacing 0644 above - if ( permissions != null && permissions.getFileMode() != null ) - { - executeCommand( "chmod -f " + permissions.getFileMode() + " " + path ); } } catch ( CommandExecutionException e ) --------------------------------------------------------------------- To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org For additional commands, e-mail: wagon-commits-help@maven.apache.org