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