diff options
| author |   Heath Caldwell <hncaldwell@gentoo.org> | 2008-12-17 20:34:56 +0000 |
|---|---|---|
| committer | Heath Caldwell <hncaldwell@gentoo.org> | 2008-12-17 20:34:56 +0000 |
| commit | 877696062e1acafe51edff660e87f34ca695ffe2 (patch) | |
| tree | 410c32e6fda14cb17d21546412d6fd0dead901e1 /app-admin | |
| parent | Remove dummy autotools INSTALL file from DOCS. (diff) | |
| download | gentoo-2-877696062e1acafe51edff660e87f34ca695ffe2.tar.gz gentoo-2-877696062e1acafe51edff660e87f34ca695ffe2.tar.bz2 gentoo-2-877696062e1acafe51edff660e87f34ca695ffe2.zip | |
Fixed tenshi-0.10-warn-logfile.patch to not error if there are fifos set (Fixes
bug #250403). Now installing documentation in the correct place (Fixes bug
(Portage version: 2.1.6.1/cvs/Linux 2.6.25-gentoo-r6-grey01 x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/tenshi/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch | 7 | ||||
| -rw-r--r-- | app-admin/tenshi/tenshi-0.10-r3.ebuild | 6 |
3 files changed, 15 insertions, 5 deletions
diff --git a/app-admin/tenshi/ChangeLog b/app-admin/tenshi/ChangeLog index e9c2d12280fe..407689c31f6a 100644 --- a/app-admin/tenshi/ChangeLog +++ b/app-admin/tenshi/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/tenshi # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/ChangeLog,v 1.54 2008/12/02 20:46:54 hncaldwell Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/ChangeLog,v 1.55 2008/12/17 20:34:56 hncaldwell Exp $ + + 17 Dec 2008; Heath Caldwell <hncaldwell@gentoo.org> + files/tenshi-0.10-warn-logfile.patch, tenshi-0.10-r3.ebuild: + Fixed tenshi-0.10-warn-logfile.patch to not error if there are fifos set + (Fixes bug #250403). Documentation location fix (Fixes bug #241254). *tenshi-0.10-r3 (02 Dec 2008) diff --git a/app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch b/app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch index 4a0f33be7aed..7a43cbbd9f2e 100644 --- a/app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch +++ b/app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch @@ -1,5 +1,5 @@ Submitted by: Heath Caldwell <hncaldwell@gentoo.org> -Date: 2008-10-21 +Date: 2008-12-17 Initial Package Version: 0.10 Upstream Status: No response Description: Warns on log files that tenshi can't open and continues monitoring the ones that it can, instead of just exiting. @@ -7,7 +7,7 @@ Description: Warns on log files that tenshi can't open and continues monitoring diff -ur tenshi-0.10/tenshi tenshi-0.10.new/tenshi --- tenshi-0.10/tenshi 2008-10-06 16:55:37.000000000 -0700 +++ tenshi-0.10.new/tenshi 2008-10-07 11:46:06.000000000 -0700 -@@ -141,10 +141,22 @@ +@@ -141,10 +141,23 @@ die RED "[ERROR] $main{'csv'}{'path'}: not executable"; } @@ -27,7 +27,8 @@ diff -ur tenshi-0.10/tenshi tenshi-0.10.new/tenshi + + push @good_log_files, $log; } -+ @good_log_files > 0 or die RED "[ERROR] no readable log files"; ++ @good_log_files > 0 || @fifo_files > 0 ++ or die RED "[ERROR] no readable log files"; + @log_files = @good_log_files; } diff --git a/app-admin/tenshi/tenshi-0.10-r3.ebuild b/app-admin/tenshi/tenshi-0.10-r3.ebuild index a73588d72ec4..e805ac566ff8 100644 --- a/app-admin/tenshi/tenshi-0.10-r3.ebuild +++ b/app-admin/tenshi/tenshi-0.10-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.10-r3.ebuild,v 1.1 2008/12/02 20:46:54 hncaldwell Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.10-r3.ebuild,v 1.2 2008/12/17 20:34:56 hncaldwell Exp $ inherit eutils @@ -35,6 +35,10 @@ src_unpack() { # Fixes for bug #243082 epatch "${FILESDIR}/${PN}-0.10-solo-queue-escalation.patch" epatch "${FILESDIR}/${PN}-0.10-warn-logfile.patch" + + # Fix for bug #241254 + sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \ + Makefile || die "docdir substitution failed" } src_install() { |