From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-384475-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1R79LL-0003Uz-K3
for garchives@archives.gentoo.org; Fri, 23 Sep 2011 17:15:19 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B4AC821C1F6;
Fri, 23 Sep 2011 17:15:11 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 7F8D221C1F6
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Sep 2011 17:15:11 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C80E81B4017
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Sep 2011 17:15:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id DC39480042
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Sep 2011 17:15:09 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <dd7c57ecb90949ce3306394cfe262566b87351ca.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/phase-helpers.sh
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: dd7c57ecb90949ce3306394cfe262566b87351ca
Date: Fri, 23 Sep 2011 17:15:09 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: f85bd904e608cacdfd4c7129c4333b16
commit: dd7c57ecb90949ce3306394cfe262566b87351ca
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 17:12:19 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 17:15:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Ddd7c57ec
unpack: handle non-gz files from deb2targz
This will fix bug #384147.
---
bin/phase-helpers.sh | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index a033fa8..ab597ff 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -340,7 +340,11 @@ unpack() {
# doesn't inadvertently install it.
rm -f "$y"
fi
- mv -f "${y%.deb}".tar.gz data.tar.gz || die "$myfail"
+ local tarfile
+ for tarfile in "${y%.deb}".tar.* ; do
+ mv -f "${tarfile}" data.tar.${tarfile##*.} || \
+ die "$myfail"
+ done
else
ar x "$srcdir$x" || die "$myfail"
fi