On 11/24/2016 11:07 AM, Brian Dolbec wrote:
> On Thu, 24 Nov 2016 10:46:21 -0800
> Zac Medico <zmed...@gentoo.org> wrote:
>
>> Since txz unpack support was added in commit
>> daa65a336102050396482f08c77524fe99e48c9f, it has been non-functional,
>> as follows:
>>
>> phase-helpers.sh: line 521: ___eapi_supports_txz: command not found
>> unpack portage-2.3.2.txz: file format not recognized. Ignoring.
>>
>> Fixes: daa65a336102 ("Add tentative EAPI6 .txz unpack support")
>> X-Gentoo-Bug: 600660
>> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=600660
>> ---
>> bin/phase-helpers.sh | 7 +++++--
>> 1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
>> index d55165c..9e4e6a2 100644
>> --- a/bin/phase-helpers.sh
>> +++ b/bin/phase-helpers.sh
>> @@ -518,8 +518,11 @@ unpack() {
>> "suffix '${suffix}'
>> which is unofficially supported" \ "with EAPI '${EAPI}'. Instead use
>> 'txz'." fi
>> - if ___eapi_supports_txz; then
>> - __unpack_tar "xz -d" ||
>> return 1
>> + if ___eapi_unpack_supports_txz; then
>> + if ! tar xof "$srcdir$x";
>> then
>> + __helpers_die
>> "$myfail"
>> + return 1
>> + fi
>> else
>> __vecho "unpack ${x}: file
>> format not recognized. Ignoring." fi
>
> looks good, thanks
>
Pushed:
https://gitweb.gentoo.org/proj/portage.git/commit/?id=d5851278daea670910cdcf1f8864b9c4494d0b31
--
Thanks,
Zac
