diff options
author | Dan Armak <danarmak@gentoo.org> | 2002-08-18 23:55:03 +0000 |
---|---|---|
committer | Dan Armak <danarmak@gentoo.org> | 2002-08-18 23:55:03 +0000 |
commit | b4312cb3916aec3642073f729e0df6341a812d28 (patch) | |
tree | faa2c012a30c4ec96135664fcad7493b47d630d0 | |
parent | gtk2 keyword support (diff) | |
download | gentoo-2-b4312cb3916aec3642073f729e0df6341a812d28.tar.gz gentoo-2-b4312cb3916aec3642073f729e0df6341a812d28.tar.bz2 gentoo-2-b4312cb3916aec3642073f729e0df6341a812d28.zip |
replace assert-like
-rw-r--r-- | eclass/cvs.eclass | 6 | ||||
-rw-r--r-- | eclass/kde-functions.eclass | 6 | ||||
-rw-r--r-- | eclass/kde.org.eclass | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass index c3d63bc7c210..07e2ef42f883 100644 --- a/eclass/cvs.eclass +++ b/eclass/cvs.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.11 2002/08/10 12:53:02 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.12 2002/08/18 23:54:59 danarmak Exp $ # This eclass provides the generic cvs fetching functions. ECLASS=cvs @@ -43,8 +43,8 @@ INHERITED="$INHERITED $ECLASS" [ -z "$ECVS_PASS" ] && ECVS_PASS="" # Module to be fetched, must be set explicitly - -# I don't like the former ="$NP" default setting -[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" +# I don't like the former ="$PN" default setting +[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue" # Subdirectory in module to be fetched, default is not defined = whole module # DO NOT set default to "", if it's defined at all code will break! diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index de25ec030f53..c16626d2f5c1 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.24 2002/08/14 19:46:29 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.25 2002/08/18 23:54:59 danarmak Exp $ # This contains everything except things that modify ebuild variables and functions (e.g. $P, src_compile() etc.) ECLASS=kde-functions INHERITED="$INHERITED $ECLASS" @@ -192,10 +192,10 @@ set-kdedir() { # check that we've set everything - [ -z "$PREFIX" ] && die "$FUNCNAME: Error: could not set install prefix, consult log" + [ -z "$PREFIX" ] && debug-print "$FUNCNAME: ERROR: could not set install prefix" # it used to be like this. any idea why??? #[ "${INHERITED//kde-dist}" != "${INHERITED}" -a -z "$KDEDIR" ] && die "$ECLASS: Error: couldn't set kdelibs location, consult log" - [ -z "$KDEDIR" ] && die "$FUNCNAME: Error: couldn't set kdelibs location, consult log" + [ -z "$KDEDIR" ] && debug-print "$FUNCNAME: ERROR: couldn't set kdelibs location" debug-print "$FUNCNAME: Will use the kdelibs installed in $KDEDIR, and install into $PREFIX." diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass index b0392f5500a8..d93c8dc95ea7 100644 --- a/eclass/kde.org.eclass +++ b/eclass/kde.org.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.14 2002/08/13 12:35:11 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.15 2002/08/18 23:55:03 danarmak Exp $ # Contains the locations of ftp.kde.org packages and their mirrors ECLASS=kde.org INHERITED="$INHERITED $ECLASS" @@ -16,7 +16,7 @@ case "$PV" in 5) SRC_URI="" # cvs ebuilds, no SRC_URI needed debug-print "$ECLASS: finished, cvs detected, SRC_URI=$SRC_URI" return 0 ;; - *) die "$ECLASS: Error: unrecognized version $PV, could not set SRC_URI" ;; + *) debug-print "$ECLASS: Error: unrecognized version $PV, could not set SRC_URI" ;; esac SRC_URI="mirror://kde/$SRC_PATH" |