From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in eclass: fcaps.eclass |
Date: | Sat, 01 Jun 2013 02:29:54 |
Message-Id: | 20130601022949.C4AE52171E@flycatcher.gentoo.org |
1 | vapier 13/06/01 02:29:49 |
2 | |
3 | Modified: fcaps.eclass |
4 | Log: |
5 | fcaps: _libcap_ng_verify: check the exit code of filecap in the pipeline and not the sed/sort commands |
6 | |
7 | Revision Changes Path |
8 | 1.6 eclass/fcaps.eclass |
9 | |
10 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fcaps.eclass?rev=1.6&view=markup |
11 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fcaps.eclass?rev=1.6&content-type=text/plain |
12 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fcaps.eclass?r1=1.5&r2=1.6 |
13 | |
14 | Index: fcaps.eclass |
15 | =================================================================== |
16 | RCS file: /var/cvsroot/gentoo-x86/eclass/fcaps.eclass,v |
17 | retrieving revision 1.5 |
18 | retrieving revision 1.6 |
19 | diff -u -r1.5 -r1.6 |
20 | --- fcaps.eclass 28 Apr 2013 04:24:59 -0000 1.5 |
21 | +++ fcaps.eclass 1 Jun 2013 02:29:49 -0000 1.6 |
22 | @@ -1,6 +1,6 @@ |
23 | # Copyright 1999-2013 Gentoo Foundation |
24 | # Distributed under the terms of the GNU General Public License v2 |
25 | -# $Header: /var/cvsroot/gentoo-x86/eclass/fcaps.eclass,v 1.5 2013/04/28 04:24:59 vapier Exp $ |
26 | +# $Header: /var/cvsroot/gentoo-x86/eclass/fcaps.eclass,v 1.6 2013/06/01 02:29:49 vapier Exp $ |
27 | |
28 | # @ECLASS: fcaps.eclass |
29 | # @MAINTAINER: |
30 | @@ -145,7 +145,8 @@ |
31 | -e "s:^.{${#file}} +::" \ |
32 | -e 's:, +:\n:g' \ |
33 | -e 2p | \ |
34 | - LC_ALL=C sort) || return 1 |
35 | + LC_ALL=C sort) |
36 | + [[ ${PIPESTATUS[0]} -eq 0 ]] || return 1 |
37 | icaps=$(echo "${caps//,cap_}" | LC_ALL=C sort) |
38 | [[ ${rcaps} == ${icaps} ]] |
39 | } |