summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2004-07-28 12:59:46 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2004-07-28 12:59:46 +0000
commit22879cc970fe29ac52c2ecdaac6fedd409dd173b (patch)
tree45ded9df951b2f3024851b29cc54135834589b58 /eclass
parentstable on alpha, ia64 and x86 (Manifest recommit) (diff)
downloadgentoo-2-22879cc970fe29ac52c2ecdaac6fedd409dd173b.tar.gz
gentoo-2-22879cc970fe29ac52c2ecdaac6fedd409dd173b.tar.bz2
gentoo-2-22879cc970fe29ac52c2ecdaac6fedd409dd173b.zip
Updates from #49733.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/eclipse-ext.eclass10
1 files changed, 6 insertions, 4 deletions
diff --git a/eclass/eclipse-ext.eclass b/eclass/eclipse-ext.eclass
index fcd42bdca37c..f248c3d54a4a 100644
--- a/eclass/eclipse-ext.eclass
+++ b/eclass/eclipse-ext.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eclipse-ext.eclass,v 1.5 2004/06/28 12:29:00 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eclipse-ext.eclass,v 1.6 2004/07/28 12:59:46 karltk Exp $
# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
@@ -83,8 +83,10 @@ function eclipse-ext_install-features {
fi
for x in $* ; do
- if [ -f $x/feature.xml ] ; then
+ if [ -d "$x" ] && [ -f $x/feature.xml ] ; then
cp -a $x ${D}/${eclipse_ext_basedir}/features
+ else
+ eerror "$x not a feature directory!"
fi
done
}
@@ -111,10 +113,10 @@ function eclipse-ext_install-plugins {
fi
for x in $* ; do
- if [ -d "$x" ] && [ -f "$x/plugin.xml" ] ; then
+ if [ -d "$x" ] && ( [ -f "$x/plugin.xml" ] || [ -f "$x/fragment.xml" ] ) ; then
cp -a $x ${D}/${eclipse_ext_basedir}/plugins
else
- eerror "$x not a a plugin directory!"
+ eerror "$x not a plugin directory!"
fi
done
}