Browse Source

resolve relative paths in file and todir attributes like all other Ant tasks do - i.e. relative to basedir

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275146 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
8443b8b1a1
1 changed files with 7 additions and 7 deletions
  1. +7
    -7
      src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java

+ 7
- 7
src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java View File

@@ -177,10 +177,10 @@ public class Scp extends SSHBase {
Session session = null; Session session = null;
try { try {
session = openSession(); session = openSession();
ScpFromMessage message = new ScpFromMessage(session,
file,
new File(toPath),
fromSshUri.endsWith("*"));
ScpFromMessage message =
new ScpFromMessage(session, file,
getProject().resolveFile(toPath),
fromSshUri.endsWith("*"));
log("Receiving file: " + file); log("Receiving file: " + file);
message.setLogListener(this); message.setLogListener(this);
message.execute(); message.execute();
@@ -222,9 +222,9 @@ public class Scp extends SSHBase {
Session session = null; Session session = null;
try { try {
session = openSession(); session = openSession();
ScpToMessage message = new ScpToMessage(session,
new File(fromPath),
file);
ScpToMessage message =
new ScpToMessage(session, getProject().resolveFile(fromPath),
file);
message.setLogListener(this); message.setLogListener(this);
message.execute(); message.execute();
} finally { } finally {


Loading…
Cancel
Save