net-analyzer/icinga: added die statements and revbump

svn path=/sunrise/; revision=11872

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 7dccd8e45dc42d9325703c93d5dffa7a07ccc580..5603c176524d5066f223cd8b8ab7374f24d7d9d4 100644 (file)
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Apr 2011; mthode <mthode@mthode.org> -icinga-1.3.1.ebuild,
+  +icinga-1.3.1-r1.ebuild:
+  added die statements and revbump
+
   07 Apr 2011; mthode <mthode@mthode.org> icinga-1.3.1.ebuild:
   changed log directory to /var/log/icinga/
 

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 5364f9946d25c335a684ec176ee97db4d2b2179f..4b0c0934e686269447424fd832b049a63c32d42d 100644 (file)
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -5,6 +5,6 @@ AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 539 RMD160 e89e70f67d5accc7ae66b77d9bf61d2e1cc9d647 SHA1 17f9317bd21a5e5dfd41bbb19f50357b80ba9599 SHA256 e5b6a782475cbbde5b49720cdbcbf14958338baca510e78e508902360a479b72
 DIST icinga-1.3.1.tar.gz 12158923 RMD160 b0b82ef3e9eb999493af3ce26f9252661d34fdaa SHA1 fb2e87ed5edbb86d9476bce9487811c7b2ed1f16 SHA256 b6eec308091a9b87b885e57e41184c496de0894660dd833074ecf4dd2cf180e0
-EBUILD icinga-1.3.1.ebuild 6114 RMD160 588bac4080d1103044f98e7f148c96fca65ec3ca SHA1 1e1a05a3729f6ce6cfbccf533fee0179ee9ac17e SHA256 20e868b80de08b2306a9e88384ec3897185fcdbf13fcf097d1d6ea1255d99a71
-MISC ChangeLog 3287 RMD160 c5454f3bbce9dcd259a4a8d7763e9e1a13235fa5 SHA1 2724be897158b2f27bc13969f9d331eed11a4eca SHA256 b98a45b5cf23c3dc0688ca2ad383f53c18b86e51310d1fc7ea28b80c34707230
+EBUILD icinga-1.3.1-r1.ebuild 6135 RMD160 38b84f4fe4c701a829106d9c40249a12902c23ed SHA1 e361e48b36b64a415026ae62bf4c9446ec7c83ff SHA256 38cd6c2dd3b2ac1f56d2e7ef87ed4601126a9861940c8ea0a737b806066fd9e5
+MISC ChangeLog 3414 RMD160 9f55a90701d84e1486eed1babbafb27d137d3096 SHA1 7f75e897d80be367e077585f6473ee5d6ecf40b1 SHA256 ca488a8c334dc4deb13f4b985bbe421cd5625131cc75cd5b313fe3067e5298b8
 MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e

diff --git a/net-analyzer/icinga/icinga-1.3.1.ebuild b/net-analyzer/icinga/icinga-1.3.1-r1.ebuild
similarity index 97%
rename from net-analyzer/icinga/icinga-1.3.1.ebuild
rename to net-analyzer/icinga/icinga-1.3.1-r1.ebuild
index 052bfbbc1a4dc6d50f1f43bb770cacb65e387785..11a05d6a3b9103213010e7a59bfe4580483b047a 100644 (file)
--- a/net-analyzer/icinga/icinga-1.3.1.ebuild
+++ b/net-analyzer/icinga/icinga-1.3.1-r1.ebuild
@@ -174,12 +174,11 @@ src_install() {
 
        fi
 
-       mkdir -p "${D}"/var/log/icinga
+       mkdir -p "${D}"/var/log/icinga || die "Failed mkdir of /var/log/icinga"
 
        fowners -R icinga:icinga /etc/icinga /var/icinga /var/log/icinga || die "Failed chown of /etc/icinga"
 
-       sed -i -e 's:^log_file=.*:log_file=/var/log/icinga/icinga.log:' "${D}"/etc/icinga/icinga.cfg
-       mv "${D}"/var/icinga/icinga.log "${D}"/var/log/icinga/icinga.log
+       sed -i -e 's:^log_file=.*:log_file=/var/log/icinga/icinga.log:' "${D}"/etc/icinga/icinga.cfg || die "Failed sed of /etc/icinga/icinga.cfg"
 
        fowners -R root:root /usr/$(get_libdir)/icinga
        cd "${D}" || die