diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-03-23 06:16:15 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-03-23 06:16:15 +0000 |
| commit | 93ec201b897a54fe706a92ac720d076952e6ab13 (patch) | |
| tree | f27a0eea0e5bc49f0222f7a0bbd4afda703c8817 /eclass/sgml-catalog.eclass | |
| parent | Bump to difffilter-0.3.3 which properly handles the presence of `\ No newline... (diff) | |
| download | historical-93ec201b897a54fe706a92ac720d076952e6ab13.tar.gz historical-93ec201b897a54fe706a92ac720d076952e6ab13.tar.bz2 historical-93ec201b897a54fe706a92ac720d076952e6ab13.zip | |
PMS says that postrm runs before postinst, so remove workaround in sgml-catalog_pkg_postrm. Fix order of arguments in einfo message.
Diffstat (limited to 'eclass/sgml-catalog.eclass')
| -rw-r--r-- | eclass/sgml-catalog.eclass | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/eclass/sgml-catalog.eclass b/eclass/sgml-catalog.eclass index df71a5af8d09..931108cb9fbb 100644 --- a/eclass/sgml-catalog.eclass +++ b/eclass/sgml-catalog.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.17 2011/12/27 17:55:12 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.18 2012/03/23 06:16:15 floppym Exp $ # # Author Matthew Turk <satai@gentoo.org> @@ -59,13 +59,7 @@ sgml-catalog_pkg_postrm() { for entry in ${SGML_TOINSTALL}; do arg1=${entry%%:*} arg2=${entry#*:} - if [ -e "${EPREFIX}"${arg2} ] - then - ewarn "${EPREFIX}${arg2} still exists! Not removing from ${EPREFIX}${arg1}" - ewarn "This is normal behavior for an upgrade ..." - continue - fi - einfo "Now removing ${EPREFIX}${arg1} from ${EPREFIX}${arg2} and ${EPREFIX}/etc/sgml/catalog" + einfo "Now removing ${EPREFIX}${arg2} from ${EPREFIX}${arg1} and ${EPREFIX}/etc/sgml/catalog" sgml-catalog_cat_doremove ${arg1} ${arg2} done } |