summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-04-29 23:25:05 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-04-29 23:25:05 +0000
commitb9a0648c78e2f5de4559efc736b7f3fb172d95fb (patch)
tree7e900479d20020d200c46b0c429ec46523e7cb80 /eclass
parentwhitespace (diff)
downloadgentoo-2-b9a0648c78e2f5de4559efc736b7f3fb172d95fb.tar.gz
gentoo-2-b9a0648c78e2f5de4559efc736b7f3fb172d95fb.tar.bz2
gentoo-2-b9a0648c78e2f5de4559efc736b7f3fb172d95fb.zip
Fix infinite look if the catalog is corrupted.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/sgml-catalog.eclass3
2 files changed, 6 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 7b96e84c87a1..10e073d167a1 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.227 2012/04/29 15:03:09 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.228 2012/04/29 23:25:05 flameeyes Exp $
+
+ 29 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> sgml-catalog.eclass:
+ Fix infinite look if the catalog is corrupted.
29 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
typo, added missing [ ] for test
diff --git a/eclass/sgml-catalog.eclass b/eclass/sgml-catalog.eclass
index b717b91de7fc..cc5de0db1d8c 100644
--- a/eclass/sgml-catalog.eclass
+++ b/eclass/sgml-catalog.eclass
@@ -1,6 +1,6 @@
# 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.19 2012/03/23 07:30:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.20 2012/04/29 23:25:05 flameeyes Exp $
# @ECLASS: sgml-catalog.eclass
# @MAINTAINER:
@@ -57,6 +57,7 @@ sgml-catalog_pkg_postinst() {
while (( $# )); do
if [[ ! -e "${EPREFIX}$2" ]]; then
ewarn "${EPREFIX}$2 doesn't appear to exist, although it ought to!"
+ shift 2
continue
fi
einfo "Now adding ${EPREFIX}$2 to ${EPREFIX}$1 and ${EPREFIX}/etc/sgml/catalog"