On 12/06/2014 04:52 PM, Brian Dolbec wrote:
>
> From 4cb661d994cf8503c4459b8f7da7ee0f739a9826 Mon Sep 17 00:00:00 2001
> From: Brian Dolbec <dol...@gentoo.org>
> Date: Sat, 6 Dec 2014 14:51:13 -0800
> Subject: [PATCH 1/2] bin/phase-helpers.shL Fix unpack() for deb2targz .xz
> types
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> Issue reported by: mva in irc
>
>>>> Unpacking source...
>>>> Unpacking 2gis_4.14.11-0trusty1+shv139+r191_amd64.deb to
>>>> /var/tmp/portage/app-misc/2gis-4.14.11.139.191/work
> deb2targz: converting '2gis_4.14.11-0trusty1+shv139+r191_amd64.deb' ...
> deb2targz: skipping section 'debian-binary'
> deb2targz: skipping section 'control.tar.gz'
> deb2targz: wrote '2gis_4.14.11-0trusty1+shv139+r191_amd64.tar.xz'
> mv: cannot stat ‘2gis_4.14.11-0trusty1+shv139+r191_amd64.tar.gz’: No such
> file or directory
> ---
> bin/phase-helpers.sh | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
> index 6e437da..91f80c9 100644
> --- a/bin/phase-helpers.sh
> +++ b/bin/phase-helpers.sh
> @@ -475,8 +475,9 @@ unpack() {
> rm -f "$y"
> fi
> if ! mv -f "${y%.deb}".tar.gz
> data.tar.gz; then
> - __helpers_die "$myfail"
> - return 1
> + if ! mv -f "${y%.deb}".tar.xz
> data.tar.xz; then
> + __helpers_die "$myfail"
> + return 1
> fi
> else
> if ! ar x "$srcdir$x"; then
>
The PMS people should be *very* interested in any changes to unpack
behavior like this. It supports behavior that will lead to failures for
older versions of portage and other package managers.
--
Thanks,
Zac
