Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13182 - main/trunk/bin/ebuild-helpers
Date: Wed, 25 Mar 2009 01:23:07
Message-Id: E1LmHph-0000Iu-3S@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-03-25 01:23:04 +0000 (Wed, 25 Mar 2009)
3 New Revision: 13182
4
5 Modified:
6 main/trunk/bin/ebuild-helpers/doexe
7 main/trunk/bin/ebuild-helpers/domo
8 Log:
9 Fix domo and doexe to return non-zero if there are any errors. Thanks to
10 zong_sharo for reporting.
11
12
13 Modified: main/trunk/bin/ebuild-helpers/doexe
14 ===================================================================
15 --- main/trunk/bin/ebuild-helpers/doexe 2009-03-25 00:34:18 UTC (rev 13181)
16 +++ main/trunk/bin/ebuild-helpers/doexe 2009-03-25 01:23:04 UTC (rev 13182)
17 @@ -14,6 +14,8 @@
18 install -d "${D}${_E_EXEDESTTREE_}"
19 fi
20
21 +ret=0
22 +
23 for x in "$@" ; do
24 if [ -L "${x}" ] ; then
25 cp "${x}" "${T}"
26 @@ -24,6 +26,11 @@
27 else
28 mysrc="${x}"
29 fi
30 - install $EXEOPTIONS "$mysrc" "$D$_E_EXEDESTTREE_" || \
31 + if ! install $EXEOPTIONS "$mysrc" "$D$_E_EXEDESTTREE_" ; then
32 echo "!!! ${0##*/}: $mysrc does not exist" 1>&2
33 + false
34 + fi
35 + ((ret+=$?))
36 done
37 +
38 +exit $ret
39
40 Modified: main/trunk/bin/ebuild-helpers/domo
41 ===================================================================
42 --- main/trunk/bin/ebuild-helpers/domo 2009-03-25 00:34:18 UTC (rev 13181)
43 +++ main/trunk/bin/ebuild-helpers/domo 2009-03-25 01:23:04 UTC (rev 13182)
44 @@ -12,6 +12,8 @@
45 install -d "${D}${DESTTREE}/share/locale/"
46 fi
47
48 +ret=0
49 +
50 for x in "$@" ; do
51 if [ -e "${x}" ] ; then
52 mytiny="${x##*/}"
53 @@ -22,5 +24,9 @@
54 install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo"
55 else
56 echo "!!! ${0##*/}: $x does not exist" 1>&2
57 + false
58 fi
59 + ((ret+=$?))
60 done
61 +
62 +exit $ret