Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: base.eclass
Date: Sat, 17 Jan 2009 16:56:57
Message-Id: E1LOETf-0003yJ-Nk@stork.gentoo.org
1 mr_bones_ 09/01/17 16:56:55
2
3 Modified: base.eclass
4 Log:
5 don't pass empty $A to unpack
6
7 Revision Changes Path
8 1.36 eclass/base.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/base.eclass?rev=1.36&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/base.eclass?rev=1.36&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/base.eclass?r1=1.35&r2=1.36
13
14 Index: base.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
17 retrieving revision 1.35
18 retrieving revision 1.36
19 diff -u -r1.35 -r1.36
20 --- base.eclass 9 Nov 2008 15:47:47 -0000 1.35
21 +++ base.eclass 17 Jan 2009 16:56:55 -0000 1.36
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2008 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.35 2008/11/09 15:47:47 loki_val Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.36 2009/01/17 16:56:55 mr_bones_ Exp $
27
28 # @ECLASS: base.eclass
29 # @MAINTAINER:
30 @@ -38,8 +38,7 @@
31
32 debug-print-function $FUNCNAME "$@"
33
34 - if [ -z "$1" ]
35 - then
36 + if [ -z "$1" ] ; then
37 case "${EAPI:-0}" in
38 2)
39 base_src_util unpack
40 @@ -80,7 +79,9 @@
41 case $1 in
42 unpack)
43 debug-print-section unpack
44 - unpack ${A}
45 + if [ ! -z "$A" ] ; then
46 + unpack ${A}
47 + fi
48 ;;
49 patch)
50 debug-print-section patch
51 @@ -91,7 +92,7 @@
52 debug-print-section autopatch
53 debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES, PATCHES1=$PATCHES1"
54 cd "${S}"
55 - if [[ ${#PATCHES[@]} -gt 1 ]]; then
56 + if [[ ${#PATCHES[@]} -gt 1 ]] ; then
57 for x in "${PATCHES[@]}"; do
58 debug-print "$FUNCNAME: autopatch: patching from ${x}"
59 epatch "${x}"