diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-11-04 19:42:24 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-04 19:42:24 -0700 |
| commit | 0f79a847dcc07237cf2623719d21929005b33583 (patch) | |
| tree | 856e8616d93f85029c0566176ae817c289b73041 | |
| parent | 36bb9d8ecf9f66b2d5d6c9733b022671aac0daad (diff) | |
| download | portage-0f79a847dcc07237cf2623719d21929005b33583.tar.gz portage-0f79a847dcc07237cf2623719d21929005b33583.tar.bz2 portage-0f79a847dcc07237cf2623719d21929005b33583.zip | |
Fix tests for ssh/sftp FETCHCOMMANDs.v2.2.0_alpha4
| -rw-r--r-- | pym/portage/tests/util/test_getconfig.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/tests/util/test_getconfig.py b/pym/portage/tests/util/test_getconfig.py index 8af827993..22e0bfc5f 100644 --- a/pym/portage/tests/util/test_getconfig.py +++ b/pym/portage/tests/util/test_getconfig.py @@ -15,8 +15,8 @@ class GetConfigTestCase(TestCase): _cases = { 'FETCHCOMMAND' : '/usr/bin/wget -t 3 -T 60 --passive-ftp -O "${DISTDIR}/${FILE}" "${URI}"', 'FETCHCOMMAND_RSYNC' : 'rsync -avP "${URI}" "${DISTDIR}/${FILE}"', - 'FETCHCOMMAND_SFTP' : 'bash -c "x=\\${2#sftp://} ; exec sftp \\"\\${x%%/*}:/\\${x#*/}\\" \\"\\$1\\"" sftp "${DISTDIR}/${FILE}" "${URI}"', - 'FETCHCOMMAND_SSH' : 'bash -c "x=\\${2#ssh://} ; exec rsync -avP \\"\\${x%%/*}:/\\${x#*/}\\" \\"\\$1\\"" rsync "${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}"', + '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}"', 'PORTAGE_ELOG_MAILSUBJECT' : '[portage] ebuild log for ${PACKAGE} on ${HOST}' } |