commit: 0299aedef74e47c0a68acf7905d8714c9578f125 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Mon Oct 21 19:40:46 2019 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Oct 21 19:42:19 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0299aede
GetConfigTestCase: update FETCHCOMMAND_RSYNC Bug: https://bugs.gentoo.org/698046 Fixes: 03c54e340073 ("make.globals: Change FETCHCOMMAND_RSYNC to --copy-links") Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/tests/util/test_getconfig.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/portage/tests/util/test_getconfig.py b/lib/portage/tests/util/test_getconfig.py index e79fca4b9..a0d00d0e1 100644 --- a/lib/portage/tests/util/test_getconfig.py +++ b/lib/portage/tests/util/test_getconfig.py @@ -1,4 +1,4 @@ -# Copyright 2010-2017 Gentoo Foundation +# Copyright 2010-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import tempfile @@ -19,7 +19,7 @@ class GetConfigTestCase(TestCase): _cases = { 'FETCHCOMMAND' : 'wget -t 3 -T 60 --passive-ftp -O "${DISTDIR}/${FILE}" "${URI}"', - 'FETCHCOMMAND_RSYNC' : 'rsync -avP "${URI}" "${DISTDIR}/${FILE}"', + 'FETCHCOMMAND_RSYNC' : 'rsync -LtvP "${URI}" "${DISTDIR}/${FILE}"', 'FETCHCOMMAND_SFTP' : 'bash -c "x=\\${2#sftp://} ; host=\\${x%%/*} ; port=\\${host##*:} ; host=\\${host%:*} ; [[ \\${host} = \\${port} ]] && port= ; eval \\"declare -a ssh_opts=(\\${3})\\" ; exec sftp \\${port:+-P \\${port}} \\"\\${ssh_opts[@]}\\" \\"\\${host}:/\\${x#*/}\\" \\"\\$1\\"" sftp "${DISTDIR}/${FILE}" "${URI}" "${PORTAGE_SSH_OPTS}"', 'FETCHCOMMAND_SSH' : 'bash -c "x=\\${2#ssh://} ; host=\\${x%%/*} ; port=\\${host##*:} ; host=\\${host%:*} ; [[ \\${host} = \\${port} ]] && port= ; exec rsync --rsh=\\"ssh \\${port:+-p\\${port}} \\${3}\\" -avP \\"\\${host}:/\\${x#*/}\\" \\"\\$1\\"" rsync "${DISTDIR}/${FILE}" "${URI}" "${PORTAGE_SSH_OPTS}"', 'PORTAGE_ELOG_MAILSUBJECT' : '[portage] ebuild log for ${PACKAGE} on ${HOST}'
