diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2004-05-22 18:56:58 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2004-05-22 18:56:58 +0000 |
| commit | 64251b77e9d3d22e7d1190903758ff65f7f8c8a3 (patch) | |
| tree | b52435e75cde640f603d4c237ad0c51cdf721695 /eclass | |
| parent | Stable on alpha and ppc (Manifest recommit) (diff) | |
| download | gentoo-2-64251b77e9d3d22e7d1190903758ff65f7f8c8a3.tar.gz gentoo-2-64251b77e9d3d22e7d1190903758ff65f7f8c8a3.tar.bz2 gentoo-2-64251b77e9d3d22e7d1190903758ff65f7f8c8a3.zip | |
Remove blocked, allow webapp-config to overwrite whatever gets in its way
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/webapp.eclass | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index 89fe4ee82657..2526cefb41b9 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.19 2004/05/22 18:45:13 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.20 2004/05/22 18:56:58 stuart Exp $ # # eclass/webapp.eclass # Eclass for installing applications to run under a web server @@ -354,14 +354,8 @@ function webapp_pkg_setup () ewarn "Whatever is in $my_dir, it's not" ewarn "compatible with webapp-config." ewarn - - my_output="`qpkg -nc -v -f $my_dir`" - if [ -n "$my_output" ]; then - eerror "Please remove $my_output and re-emerge." - else - eerror "Please remove the contents of $my_dir, and then re-emerge." - fi - die "Cannot upgrade contents of $my_dir" + ewarn "This ebuild may be overwriting important files." + ewarn elif [ "`echo $my_output | awk '{ print $1 }'`" != "$PN" ]; then eerror "$my_dir contains $my_output" eerror "I cannot upgrade that" |