From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B10C51389E2 for ; Sun, 7 Dec 2014 00:52:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A285E0878; Sun, 7 Dec 2014 00:52:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 206B0E0805 for ; Sun, 7 Dec 2014 00:52:29 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010634bdfa9ecf80.vc.shawcable.net [96.49.31.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id D04F5340641 for ; Sun, 7 Dec 2014 00:52:27 +0000 (UTC) Date: Sat, 6 Dec 2014 16:52:01 -0800 From: Brian Dolbec To: gentoo-portage-dev@lists.gentoo.org Subject: [gentoo-portage-dev] [PATCH 1/2] bin/phase-helpers.shL Fix unpack() for deb2targz .xz types Message-ID: <20141206165201.0dc3ea1c.dolsen@gentoo.org> Organization: Gentoo Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 77402f4f-c92e-42cb-858c-ad349d8fb09d X-Archives-Hash: 4bcfbd8608eae7aecba8e1e1547adc0f =46rom 4cb661d994cf8503c4459b8f7da7ee0f739a9826 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Sat, 6 Dec 2014 14:51:13 -0800 Subject: [PATCH 1/2] bin/phase-helpers.shL Fix unpack() for deb2targz .xz t= ypes MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-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/porta= ge/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 =E2=80=982gis_4.14.11-0trusty1+shv139+r191_amd64.tar.gz=E2= =80=99: 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 --=20 2.1.2 --=20 Brian Dolbec