1 |
On Thu, 24 Nov 2016 10:46:21 -0800 |
2 |
Zac Medico <zmedico@g.o> wrote: |
3 |
|
4 |
> Since txz unpack support was added in commit |
5 |
> daa65a336102050396482f08c77524fe99e48c9f, it has been non-functional, |
6 |
> as follows: |
7 |
> |
8 |
> phase-helpers.sh: line 521: ___eapi_supports_txz: command not found |
9 |
> unpack portage-2.3.2.txz: file format not recognized. Ignoring. |
10 |
> |
11 |
> Fixes: daa65a336102 ("Add tentative EAPI6 .txz unpack support") |
12 |
> X-Gentoo-Bug: 600660 |
13 |
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=600660 |
14 |
> --- |
15 |
> bin/phase-helpers.sh | 7 +++++-- |
16 |
> 1 file changed, 5 insertions(+), 2 deletions(-) |
17 |
> |
18 |
> diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
19 |
> index d55165c..9e4e6a2 100644 |
20 |
> --- a/bin/phase-helpers.sh |
21 |
> +++ b/bin/phase-helpers.sh |
22 |
> @@ -518,8 +518,11 @@ unpack() { |
23 |
> "suffix '${suffix}' |
24 |
> which is unofficially supported" \ "with EAPI '${EAPI}'. Instead use |
25 |
> 'txz'." fi |
26 |
> - if ___eapi_supports_txz; then |
27 |
> - __unpack_tar "xz -d" || |
28 |
> return 1 |
29 |
> + if ___eapi_unpack_supports_txz; then |
30 |
> + if ! tar xof "$srcdir$x"; |
31 |
> then |
32 |
> + __helpers_die |
33 |
> "$myfail" |
34 |
> + return 1 |
35 |
> + fi |
36 |
> else |
37 |
> __vecho "unpack ${x}: file |
38 |
> format not recognized. Ignoring." fi |
39 |
|
40 |
looks good, thanks |
41 |
|
42 |
-- |
43 |
Brian Dolbec <dolsen> |