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