diff options
| -rw-r--r-- | eclass/sgml-catalog.eclass | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/eclass/sgml-catalog.eclass b/eclass/sgml-catalog.eclass index 310cfe035d4a..ebc68c4d716f 100644 --- a/eclass/sgml-catalog.eclass +++ b/eclass/sgml-catalog.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 # Author Matthew Turk <satai@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.1 2002/12/31 04:35:01 satai Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.2 2003/01/02 02:20:46 satai Exp $ # inherit base @@ -37,12 +37,17 @@ sgml-catalog_pkg_postinst() { do arg1=`echo ${toinstall[$i]} | cut -f1 -d\:` arg2=`echo ${toinstall[$i]} | cut -f2 -d\:` + if [ ! -e $arg2 ] + then + ewarn "${arg2} doesn't appear to exist, although it ought to!" + return + fi einfo "Now adding $arg1 to $arg2 and /etc/sgml/catalog" sgml-catalog_cat_doinstall $arg1 $arg2 done } -sgml-catalog_pkg_prerm() { +sgml-catalog_pkg_postrm() { debug-print function $FUNCNAME $* declare -i topindex topindex="catcounter-1" @@ -50,13 +55,19 @@ sgml-catalog_pkg_prerm() { do arg1=`echo ${toinstall[$i]} | cut -f1 -d\:` arg2=`echo ${toinstall[$i]} | cut -f2 -d\:` + if [ -e $arg2 ] + then + ewarn "${arg2} still exists! Not removing from ${arg1}" + ewarn "This is normal behavior for an upgrade..." + return + fi einfo "Now removing $arg1 from $arg2 and /etc/sgml/catalog" sgml-catalog_cat_doremove $arg1 $arg2 done } sgml-catalog_src_compile() { - dummy="DUMMY" + return } -EXPORT_FUNCTIONS pkg_prerm pkg_postinst src_compile +EXPORT_FUNCTIONS pkg_postrm pkg_postinst src_compile |