| 1 |
vapier 11/11/29 19:01:28 |
| 2 |
|
| 3 |
Modified: user.eclass |
| 4 |
Log: |
| 5 |
tweak failure message as pointed out by David James |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.15 eclass/user.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?rev=1.15&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?rev=1.15&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?r1=1.14&r2=1.15 |
| 13 |
|
| 14 |
Index: user.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/user.eclass,v |
| 17 |
retrieving revision 1.14 |
| 18 |
retrieving revision 1.15 |
| 19 |
diff -u -r1.14 -r1.15 |
| 20 |
--- user.eclass 26 Nov 2011 07:20:31 -0000 1.14 |
| 21 |
+++ user.eclass 29 Nov 2011 19:01:28 -0000 1.15 |
| 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/user.eclass,v 1.14 2011/11/26 07:20:31 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.15 2011/11/29 19:01:28 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: user.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -20,9 +20,10 @@ |
| 31 |
case ${EBUILD_PHASE} in |
| 32 |
setup|preinst|postinst) ;; |
| 33 |
*) |
| 34 |
- eerror "'$1()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." |
| 35 |
+ eerror "'$1()' called from '${EBUILD_PHASE}' phase which is not OK:" |
| 36 |
+ eerror "You may only call from pkg_{setup,preinst,postinst} functions." |
| 37 |
eerror "Package fails at QA and at life. Please file a bug." |
| 38 |
- die "Bad package! $1 is only for use in pkg_* functions!" |
| 39 |
+ die "Bad package! $1 is only for use in some pkg_* functions!" |
| 40 |
esac |
| 41 |
} |
| 42 |
|
| 43 |
@@ -103,7 +104,7 @@ |
| 44 |
# Default uid is (pass -1 for this) next available, default shell is |
| 45 |
# /bin/false, default homedir is /dev/null, and there are no default groups. |
| 46 |
enewuser() { |
| 47 |
- _assert_pkg_ebuild_phase enewuser |
| 48 |
+ _assert_pkg_ebuild_phase ${FUNCNAME} |
| 49 |
|
| 50 |
# get the username |
| 51 |
local euser=$1; shift |
| 52 |
@@ -272,7 +273,7 @@ |
| 53 |
# do the rest. You may specify the gid for the group or allow the group to |
| 54 |
# allocate the next available one. |
| 55 |
enewgroup() { |
| 56 |
- _assert_pkg_ebuild_phase enewgroup |
| 57 |
+ _assert_pkg_ebuild_phase ${FUNCNAME} |
| 58 |
|
| 59 |
# get the group |
| 60 |
local egroup=$1; shift |
Archives