diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-11-04 19:24:15 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-04 19:24:15 -0700 |
| commit | 36bb9d8ecf9f66b2d5d6c9733b022671aac0daad (patch) | |
| tree | f5585b7a6022f8727cc0a3d7f089113b1c3d98d2 /cnf | |
| parent | binarytree: handle binhost port for sftp/ssh (diff) | |
| download | portage-36bb9d8ecf9f66b2d5d6c9733b022671aac0daad.tar.gz portage-36bb9d8ecf9f66b2d5d6c9733b022671aac0daad.tar.bz2 portage-36bb9d8ecf9f66b2d5d6c9733b022671aac0daad.zip | |
complete binhost ssh/sftp port support
Diffstat (limited to 'cnf')
| -rw-r--r-- | cnf/make.globals | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index 69a553d5f..645b7a580 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -43,10 +43,10 @@ RESUMECOMMAND="/usr/bin/wget -c -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FIL FETCHCOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\"" RESUMECOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\"" -FETCHCOMMAND_SSH="bash -c \"x=\\\${2#ssh://} ; exec rsync -avP \\\"\\\${x%%/*}:/\\\${x#*/}\\\" \\\"\\\$1\\\"\" rsync \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" +FETCHCOMMAND_SSH="bash -c \"x=\\\${2#ssh://} ; host=\\\${x%%/*} ; port=\\\${host##*:} ; host=\\\${host%:*} ; [[ \\\${host} = \\\${port} ]] && port=22 ; exec rsync --rsh=\\\"ssh -p\\\${port}\\\" -avP \\\"\\\${host}:/\\\${x#*/}\\\" \\\"\\\$1\\\"\" rsync \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" RESUMECOMMAND_SSH=${FETCHCOMMAND_SSH} -FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; exec sftp \\\"\\\${x%%/*}:/\\\${x#*/}\\\" \\\"\\\$1\\\"\" sftp \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" +FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${host##*:} ; host=\\\${host%:*} ; [[ \\\${host} = \\\${port} ]] && port=22 ; exec sftp -P \\\${port} \\\"\\\${host}:/\\\${x#*/}\\\" \\\"\\\$1\\\"\" sftp \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" # Default user options FEATURES="assume-digests binpkg-logs distlocks fixpackages |