1 |
commit: b8c070708bbc6d0db544d4b04b530d6d03d39bb5 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 28 06:15:53 2018 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 28 06:15:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b8c07070 |
7 |
|
8 |
emerge-delta-webrsync: fix vecho command substitution |
9 |
|
10 |
Since vecho now outputs to stderr, the output has to be redirected |
11 |
to stdout when command substitution is intended. |
12 |
|
13 |
Fixes: 2b6210463300 ("isolated-functions.sh: Ensure informational command output to stderr") |
14 |
|
15 |
misc/emerge-delta-webrsync | 2 +- |
16 |
1 file changed, 1 insertion(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync |
19 |
index 14e5c7c55..8419e01a9 100755 |
20 |
--- a/misc/emerge-delta-webrsync |
21 |
+++ b/misc/emerge-delta-webrsync |
22 |
@@ -342,7 +342,7 @@ sync_local() { |
23 |
if type -P tarsync > /dev/null ; then |
24 |
local chown_opts="-o ${ownership%:*} -g ${ownership#*:}" |
25 |
chown ${ownership} "${repo_location}" > /dev/null 2>&1 || chown_opts="" |
26 |
- if ! tarsync $(__vecho -v) -s 1 ${chown_opts} \ |
27 |
+ if ! tarsync $(__vecho -v 2>&1) -s 1 ${chown_opts} \ |
28 |
-e /distfiles -e /packages -e /local "${file}" "${repo_location}"; then |
29 |
eecho "tarsync failed; tarball is corrupt? (${file})" |
30 |
return 1 |