commit: 05da38b2228bb1105e98d48412168f9ac0db87b6
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 6 22:51:13 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Dec 7 23:21:21 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=05da38b2
bin/phase-helpers.shL Fix unpack() for deb2targz .xz types
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 afad2e9..aca9e64 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -477,8 +477,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
