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 | 01f782c81cb7c534f1a758bb655a3329508768fa (patch) | |
| tree | b019f11e1fe2e180cc55307bcc50e3bdbddd0939 /eclass | |
| parent | Bump to difffilter-0.3.3 which properly handles the presence of `\ No newline... (diff) | |
| download | gentoo-2-01f782c81cb7c534f1a758bb655a3329508768fa.tar.gz gentoo-2-01f782c81cb7c534f1a758bb655a3329508768fa.tar.bz2 gentoo-2-01f782c81cb7c534f1a758bb655a3329508768fa.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')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/sgml-catalog.eclass | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 4feab12e5f70..bf154747b8e2 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.180 2012/03/22 12:03:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.181 2012/03/23 06:16:15 floppym Exp $ + + 23 Mar 2012; Mike Gilbert <floppym@gentoo.org> sgml-catalog.eclass: + PMS says that postrm runs before postinst, so remove workaround in + sgml-catalog_pkg_postrm. Fix order of arguments in einfo message. 22 Mar 2012; Alexis Ballier <aballier@gentoo.org> texlive-module.eclass: Drop support for pre-2010 TeX Live versions 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 } |