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: Fri, 30 Sep 2011 16:51:12
Message-Id: 20110930165101.A1DD520036@flycatcher.gentoo.org
1 vapier 11/09/30 16:51:01
2
3 Modified: eutils.eclass
4 Log:
5 edos2unix now dies when sed fails
6
7 Revision Changes Path
8 1.366 eclass/eutils.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.366&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.366&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.365&r2=1.366
13
14 Index: eutils.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
17 retrieving revision 1.365
18 retrieving revision 1.366
19 diff -u -r1.365 -r1.366
20 --- eutils.eclass 29 Sep 2011 02:32:20 -0000 1.365
21 +++ eutils.eclass 30 Sep 2011 16:51:01 -0000 1.366
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2011 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.365 2011/09/29 02:32:20 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.366 2011/09/30 16:51:01 vapier Exp $
27
28 # @ECLASS: eutils.eclass
29 # @MAINTAINER:
30 @@ -919,7 +919,8 @@
31 # is a script based solution. Just give it a list of files to convert and
32 # they will all be changed from the DOS CRLF format to the UNIX LF format.
33 edos2unix() {
34 - echo "$@" | xargs sed -i 's/\r$//'
35 + [[ $# -eq 0 ]] && return 0
36 + sed -i 's/\r$//' -- "$@" || die
37 }
38
39 # Make a desktop file !