Gentoo Archives: gentoo-commits

From: "Theo Chatzimichos (tampakrap)" <tampakrap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: kde4-meta.eclass
Date: Wed, 29 Dec 2010 16:38:58
Message-Id: 20101229163850.21C5720054@flycatcher.gentoo.org
1 tampakrap 10/12/29 16:38:50
2
3 Modified: kde4-meta.eclass
4 Log:
5 Catch unpacking errors with die, fixes bug 338397
6 Move kde overlay commits b0b8623840b2ac1bf8a29f869c1fbbe30ebdcc6c and f353c08c2b2d3ee444986458bca836b2922dad02 written by dilfridge
7
8 Revision Changes Path
9 1.45 eclass/kde4-meta.eclass
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.45&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.45&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.44&r2=1.45
14
15 Index: kde4-meta.eclass
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
18 retrieving revision 1.44
19 retrieving revision 1.45
20 diff -u -r1.44 -r1.45
21 --- kde4-meta.eclass 2 Dec 2010 21:49:54 -0000 1.44
22 +++ kde4-meta.eclass 29 Dec 2010 16:38:50 -0000 1.45
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2010 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.44 2010/12/02 21:49:54 alexxy Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.45 2010/12/29 16:38:50 tampakrap Exp $
28 #
29 # @ECLASS: kde4-meta.eclass
30 # @MAINTAINER:
31 @@ -245,8 +245,8 @@
32 extractlist+=" $(__list_needed_subdirectories)"
33
34 pushd "${WORKDIR}" > /dev/null
35 - [[ -n ${KDE4_STRICTER} ]] && echo tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} >&2
36 - tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} 2> /dev/null
37 + [[ -n ${KDE4_STRICTER} ]] && echo tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist}
38 + tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} || ewarn "tar extract command failed at least partially - continuing anyway"
39
40 # Default $S is based on $P; rename the extracted directory to match $S if necessary
41 mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\""