diff options
author | Andrew Niefer | 2011-09-01 20:33:46 +0000 |
---|---|---|
committer | Andrew Niefer | 2011-09-01 20:33:46 +0000 |
commit | 24d582c3b5ebad262bb80fb96d308d1bb0d6578f (patch) | |
tree | fd2c8ddfb829e86829f29fead654249618a22b94 | |
parent | 0b0ec22f8ca473096c98d8d831d86c4f9b86d44c (diff) | |
download | rt.equinox.framework-24d582c3b5ebad262bb80fb96d308d1bb0d6578f.tar.gz rt.equinox.framework-24d582c3b5ebad262bb80fb96d308d1bb0d6578f.tar.xz rt.equinox.framework-24d582c3b5ebad262bb80fb96d308d1bb0d6578f.zip |
fix use of user name durin ssh/scp
-rw-r--r-- | releng/org.eclipse.equinox.launcher.releng/build.xml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml index 3ef1b8fea..9088144d7 100644 --- a/releng/org.eclipse.equinox.launcher.releng/build.xml +++ b/releng/org.eclipse.equinox.launcher.releng/build.xml @@ -354,16 +354,13 @@ <condition property="scpDest" value="${userName}@${machine}" else="${machine}" > <isset property="userName" /> </condition> - <condition property="sshUser" value="-l ${userName}" else="" > - <isset property="userName" /> - </condition> <zip basedir="${localGitClone}/bundles/org.eclipse.equinox.executable/library" includes="**" destfile="${basedir}/library.zip" /> <mkremote dir="${scpDest}:${workspace}/${os}.${ws}.${arch}"/> <SCP dir="${basedir}" source="remote.sh build.xml launcher.properties library.zip" destination="${scpDest}:${workspace}/${os}.${ws}.${arch}" /> <echo message="Execing ssh ${machine}" /> <exec executable="ssh" failonerror="true" > - <arg line="${sshUser} ${machine}" /> + <arg line="${scpDest}" /> <arg line="sh ${workspace}/${os}.${ws}.${arch}/remote.sh" /> <arg line="${javaArg}" /> <arg line="-Dos=${os} -Dws=${ws} -Darch=${arch} -DgitTag=${gitTag}" /> |