Fix detection for incompatible upgrades

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 28 insertions, 27 deletions

diff --git a/net-analyzer/nagios/ChangeLog b/net-analyzer/nagios/ChangeLog
index 9d7ec5101a8c..15c1e89f53a0 100644
--- a/net-analyzer/nagios/ChangeLog
+++ b/net-analyzer/nagios/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nagios
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.75 2008/12/02 17:49:44 dertobi123 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.76 2009/01/04 18:30:06 dertobi123 Exp $
+
+  04 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org> nagios-3.0.6.ebuild:
+  Fix detection for incompatible upgrades
 
 *nagios-3.0.6 (02 Dec 2008)
 
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index e6cd6614cfa7..70912ee103a4 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,4 +1,4 @@
 EBUILD nagios-2.12.ebuild 856 RMD160 e9b0bbbff4bad51973abd96cd0aac4bb1a1c2401 SHA1 7248dac905c510915b9ad690c55110a063b2b3c4 SHA256 99e0511b725eac560d0ab6a280b7a0251c1e4e81cffc8fe4d879084c32a14c92
-EBUILD nagios-3.0.6.ebuild 1880 RMD160 2fbeb62e1a22c2d36f2b9458a52daef4a44c83de SHA1 ec943c59ff1963e236bfd8802fa787ba2fa19f1a SHA256 414768dd94c62136e971179480b213abb57313ea5d1df3d892b39b9e8b17150e
-MISC ChangeLog 10363 RMD160 1d7a8612e92876a9974343e270f4111edff4b8ae SHA1 42deeba593b872d68b3a1c337f193d09bf75f02e SHA256 e75f8848ac95fac61269dfba1e7efd949431c5a6209b911f90380b26e2cbc189
+EBUILD nagios-3.0.6.ebuild 1804 RMD160 e473d9e547ed2c46edd96ce947c975d55e5ad6fe SHA1 a0bea4ebfdce472407171a6c8db1af120ebdce39 SHA256 51fbc02de1bfadb33f810f986bb158a57fd205889721be01c80d3c52e4db33a0
+MISC ChangeLog 10483 RMD160 9c4f0b83c59da77c40cc52d868d7aadc737d2a93 SHA1 e1b9dce9707d09496d290e702e438d0e78aa8187 SHA256 2b59072c60b1a17337ea1d9aae0641ea2d5ec27241ab78568d1d2b3114440753
 MISC metadata.xml 963 RMD160 34a65fa482244335865f889d4ff500d6eaff4652 SHA1 b63ecd87d1a48ec89bb8d1b571af2990e5c4a46d SHA256 1caad75fb2c860e761a2ef082cae698e6d34499b68af04c6bc214ca019bdab3d
diff --git a/net-analyzer/nagios/nagios-3.0.6.ebuild b/net-analyzer/nagios/nagios-3.0.6.ebuild
index c947150426d2..f91adfd392bd 100644
--- a/net-analyzer/nagios/nagios-3.0.6.ebuild
+++ b/net-analyzer/nagios/nagios-3.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-3.0.6.ebuild,v 1.1 2008/12/02 17:49:44 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-3.0.6.ebuild,v 1.2 2009/01/04 18:30:06 dertobi123 Exp $
 
 DESCRIPTION="The Nagios metapackage - merge this to pull install all of the
 nagios packages"
@@ -17,27 +17,25 @@ RDEPEND="~net-analyzer/nagios-core-${PV}
 
 pkg_setup() {
 	# Avoid upgrading from Nagios <3 as the directory structure has changed
-	if [[ -f /var/lib/init.d/started/nagios ]] ; then
-		if has_version '<net-analyzer/nagios-3.0' ; then
-			if [[ "${FORCE_UPGRADE}" ]] ; then
-				echo
-				ewarn "you are upgrading from an incompatible version and have"
-				ewarn "FORCE_UPGRADE set, will build this package while Nagios is running."
-				echo
-			else
-				echo
-				eerror "You are upgrading from an incompatible version."
-				eerror "Please be advised that installation paths have changed to a more FHS"
-				eerror "compliant structure and you won't be able to easily upgrade to"
-				eerror "Nagios 3 therefore. You will have to change your configuration"
-				eerror "to reflect this change, for example Nagios plugins are now installed"
-				eerror "into /usr/$(get_libdir)/nagios/plugins/ instead of /usr/nagios/libexec."
-				echo
-				eerror "If you want to upgrade now, emerge nagios with:"
-				eerror "    FORCE_UPGRADE=1 emerge nagios"
-				die "Upgrading from an incompatible version!"
-				echo
-			fi
+	if has_version '<net-analyzer/nagios-3.0' ; then
+		if [[ "${FORCE_UPGRADE}" ]] ; then
+			echo
+			ewarn "you are upgrading from an incompatible version and have"
+			ewarn "FORCE_UPGRADE set, will build this package while Nagios is running."
+			echo
+		else
+			echo
+			eerror "You are upgrading from an incompatible version."
+			eerror "Please be advised that installation paths have changed to a more FHS"
+			eerror "compliant structure and you won't be able to easily upgrade to"
+			eerror "Nagios 3 therefore. You will have to change your configuration"
+			eerror "to reflect this change, for example Nagios plugins are now installed"
+			eerror "into /usr/$(get_libdir)/nagios/plugins/ instead of /usr/nagios/libexec."
+			echo
+			eerror "If you want to upgrade now, emerge nagios with:"
+			eerror "    FORCE_UPGRADE=1 emerge nagios"
+			die "Upgrading from an incompatible version!"
+			echo
 		fi
 	fi
 }