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