-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Mike Frysinger wrote:
> On Wednesday 26 September 2007, Marijn Schouten (hkBst) wrote:
>> Who's gonna fix usr/lib/portage/bin/ebuild.sh?
>
> what's broken in it ?
> -mike
Well, apparently it checking FEATURES is illegal, plus it seems that it
contains dead code. Why not replace it with:
src_test() {
if emake -j1 check -n &> /dev/null; then
vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
emake -j1 check || die "Make check failed. See above for
details."
elif emake -j1 test -n &> /dev/null; then
vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
emake -j1 test || die "Make test failed. See above for details."
else
vecho ">>> Test phase [none]: ${CATEGORY}/${PF}"
fi
}
or in patch version:
- --- /usr/lib/portage/bin/ebuild.sh 2007-09-09 12:50:51.000000000 +0200
+++ /home/marijn/ebuild.sh 2007-09-27 11:58:18.000000000 +0200
@@ -666,16 +666,10 @@
src_test() {
if emake -j1 check -n &> /dev/null; then
vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
- - if ! emake -j1 check; then
- - hasq test $FEATURES && die "Make check failed. See
above for details."
- - hasq test $FEATURES || eerror "Make check failed. See
above for details."
- - fi
+ emake -j1 check || die "Make check failed. See above for details."
elif emake -j1 test -n &> /dev/null; then
vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
- - if ! emake -j1 test; then
- - hasq test $FEATURES && die "Make test failed. See
above for details."
- - hasq test $FEATURES || eerror "Make test failed. See
above for details."
- - fi
+ emake -j1 test || die "Make test failed. See above for details."
else
vecho ">>> Test phase [none]: ${CATEGORY}/${PF}"
fi
Marijn
- --
Marijn Schouten (hkBst), Gentoo Lisp project
<http://www.gentoo.org/proj/en/lisp/>, #gentoo-lisp on FreeNode
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFG+38Qp/VmCx0OL2wRApdnAJ9Yos8HKuhSX3UDS8rEe3qEeU7AbgCgxlOG
U8eATzDOZf7tFXXnJUD7vZk=
=4TEF
-----END PGP SIGNATURE-----
--
[EMAIL PROTECTED] mailing list
