diff options
| author |   Sam James <sam@gentoo.org> | 2024-06-20 11:20:54 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-06-20 11:23:16 +0100 |
| commit | 9fddd648ec082fee2718115dbe3183cbbe8adb45 (patch) | |
| tree | 3ab4273b42cbab32add08534bc83028a6ed179f6 /sys-fs | |
| parent | sys-apps/util-linux: optimize src_unpack further (diff) | |
| download | gentoo-9fddd648ec082fee2718115dbe3183cbbe8adb45.tar.gz gentoo-9fddd648ec082fee2718115dbe3183cbbe8adb45.tar.bz2 gentoo-9fddd648ec082fee2718115dbe3183cbbe8adb45.zip | |
sys-fs/btrfs-progs: optimize src_unpack further
As mentioned in c8e331071da74d11d651ebd32bbf4efbd25e0f8e.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild | 14 | ||||
| -rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild index 40632b73ce14..b4d9a3171bef 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild @@ -96,13 +96,15 @@ pkg_setup() { if [[ ${PV} != 9999 ]]; then src_unpack() { - if use verify-sig ; then - # Upstream sign the decompressed .tar - verify-sig_verify_detached \ - <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ - "${DISTDIR}"/${MY_P}.tar.sign + # Upstream sign the decompressed .tar + if use verify-sig; then + einfo "Unpacking ${MY_P}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \ + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + else + default fi - default } fi diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index 40632b73ce14..b4d9a3171bef 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -96,13 +96,15 @@ pkg_setup() { if [[ ${PV} != 9999 ]]; then src_unpack() { - if use verify-sig ; then - # Upstream sign the decompressed .tar - verify-sig_verify_detached \ - <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \ - "${DISTDIR}"/${MY_P}.tar.sign + # Upstream sign the decompressed .tar + if use verify-sig; then + einfo "Unpacking ${MY_P}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \ + < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + else + default fi - default } fi |