From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Date: Tue, 27 Apr 2021 19:45:44 +0000 (+0200)
Subject: support/download/hg: fix broken method
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4d6c6b1bd411b1dcab2c50e3aa35da5755da790a;p=buildroot.git

support/download/hg: fix broken method

Commit 54d3d94b6e3846447b5796ef8587b08b537cd348 broke the 'hg' download
method, in a similar way as it broke the 'git' download method (later fixed
with commit b70ce5665126246bd6b6bf804c6d9eea1fc599cf), by introducing extra
output on stdout in a case where the output is redirected.

In the case of 'hg', the 'hg archive' step uses shell redirection rather
than directly letting hg write the output file, since commit
76b51f90c0e393349dd0c71d7e6cf82fbc094282.

As a result, the extra print added by the _hg function is prepended to the
actual archive, causing an invalid archive.

Fix by using the _plain_hg function instead. The disadvantage is that the
command for 'hg archive' is no longer printed.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---

diff --git a/support/download/hg b/support/download/hg
index a7542e5c84..768a27e06f 100755
--- a/support/download/hg
+++ b/support/download/hg
@@ -45,6 +45,6 @@ _plain_hg() {
 
 _hg clone ${quiet} "${@}" --noupdate "'${uri}'" "'${basename}'"
 
-_hg archive ${quiet} --repository "'${basename}'" --type tgz \
+_plain_hg archive ${quiet} --repository "'${basename}'" --type tgz \
             --prefix "'${basename}'" --rev "'${cset}'" \
             - >"${output}"