Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass
Date: Thu, 20 May 2010 02:21:21
Message-Id: 20100520022118.3FFDA2C85C@corvid.gentoo.org
1 vapier 10/05/20 02:21:18
2
3 Modified: eutils.eclass
4 Log:
5 drop unnecessary output padding in unpack_makeself #320313
6
7 Revision Changes Path
8 1.344 eclass/eutils.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.344&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.344&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.343&r2=1.344
13
14 Index: eutils.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
17 retrieving revision 1.343
18 retrieving revision 1.344
19 diff -u -r1.343 -r1.344
20 --- eutils.eclass 11 May 2010 20:08:02 -0000 1.343
21 +++ eutils.eclass 20 May 2010 02:21:17 -0000 1.344
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2009 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.343 2010/05/11 20:08:02 mr_bones_ Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.344 2010/05/20 02:21:17 vapier Exp $
27
28 # @ECLASS: eutils.eclass
29 # @MAINTAINER:
30 @@ -1341,15 +1341,15 @@
31 ;;
32 2.1.1)
33 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
34 - let skip="skip + 1"
35 + (( skip++ ))
36 ;;
37 2.1.2)
38 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
39 - let skip="skip + 1"
40 + (( skip++ ))
41 ;;
42 2.1.3)
43 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
44 - let skip="skip + 1"
45 + (( skip++ ))
46 ;;
47 2.1.4|2.1.5)
48 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
49 @@ -1368,7 +1368,7 @@
50 fi
51 case ${exe} in
52 tail) exe="tail -n +${skip} '${src}'";;
53 - dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
54 + dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
55 *) die "makeself cant handle exe '${exe}'"
56 esac