1 |
From 4cb661d994cf8503c4459b8f7da7ee0f739a9826 Mon Sep 17 00:00:00 2001 |
2 |
From: Brian Dolbec <dolsen@g.o> |
3 |
Date: Sat, 6 Dec 2014 14:51:13 -0800 |
4 |
Subject: [PATCH 1/2] bin/phase-helpers.shL Fix unpack() for deb2targz .xz types |
5 |
MIME-Version: 1.0 |
6 |
Content-Type: text/plain; charset=UTF-8 |
7 |
Content-Transfer-Encoding: 8bit |
8 |
|
9 |
Issue reported by: mva in irc |
10 |
|
11 |
>>> Unpacking source... |
12 |
>>> Unpacking 2gis_4.14.11-0trusty1+shv139+r191_amd64.deb to /var/tmp/portage/app-misc/2gis-4.14.11.139.191/work |
13 |
deb2targz: converting '2gis_4.14.11-0trusty1+shv139+r191_amd64.deb' ... |
14 |
deb2targz: skipping section 'debian-binary' |
15 |
deb2targz: skipping section 'control.tar.gz' |
16 |
deb2targz: wrote '2gis_4.14.11-0trusty1+shv139+r191_amd64.tar.xz' |
17 |
mv: cannot stat ‘2gis_4.14.11-0trusty1+shv139+r191_amd64.tar.gz’: No such file or directory |
18 |
--- |
19 |
bin/phase-helpers.sh | 5 +++-- |
20 |
1 file changed, 3 insertions(+), 2 deletions(-) |
21 |
|
22 |
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
23 |
index 6e437da..91f80c9 100644 |
24 |
--- a/bin/phase-helpers.sh |
25 |
+++ b/bin/phase-helpers.sh |
26 |
@@ -475,8 +475,9 @@ unpack() { |
27 |
rm -f "$y" |
28 |
fi |
29 |
if ! mv -f "${y%.deb}".tar.gz data.tar.gz; then |
30 |
- __helpers_die "$myfail" |
31 |
- return 1 |
32 |
+ if ! mv -f "${y%.deb}".tar.xz data.tar.xz; then |
33 |
+ __helpers_die "$myfail" |
34 |
+ return 1 |
35 |
fi |
36 |
else |
37 |
if ! ar x "$srcdir$x"; then |
38 |
-- |
39 |
2.1.2 |
40 |
|
41 |
-- |
42 |
Brian Dolbec <dolsen> |