summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Shepherd <masterdriverz@gentoo.org>2007-01-27 16:51:37 +0000
committerCharlie Shepherd <masterdriverz@gentoo.org>2007-01-27 16:51:37 +0000
commit1712933a4925c4939f714f176fcb8b692192ccd3 (patch)
treeb4b13dcddb5f0084fc01852298448c1fb6afe3b7 /app-admin
parentMarked ppc stable for bug #155327. (diff)
downloadgentoo-2-1712933a4925c4939f714f176fcb8b692192ccd3.tar.gz
gentoo-2-1712933a4925c4939f714f176fcb8b692192ccd3.tar.bz2
gentoo-2-1712933a4925c4939f714f176fcb8b692192ccd3.zip
Don't clean /var/tmp/portage in the example cron if emerge is running; thanks to Ulf Schaper; bug 146973
(Portage version: 2.1.2_rc4-r3)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/tmpwatch/ChangeLog7
-rw-r--r--app-admin/tmpwatch/files/tmpwatch.cron4
-rw-r--r--app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild6
3 files changed, 11 insertions, 6 deletions
diff --git a/app-admin/tmpwatch/ChangeLog b/app-admin/tmpwatch/ChangeLog
index ab453c20910c..0cf98f649a47 100644
--- a/app-admin/tmpwatch/ChangeLog
+++ b/app-admin/tmpwatch/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/tmpwatch
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/ChangeLog,v 1.50 2007/01/17 21:24:23 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/ChangeLog,v 1.51 2007/01/27 16:51:37 masterdriverz Exp $
+
+ 27 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+ files/tmpwatch.cron, tmpwatch-2.9.4.1.ebuild:
+ Don't clean /var/tmp/portage in the example cron if emerge is running;
+ thanks to Ulf Schaper; bug 146973
17 Jan 2007; Alec Warner <antarus@gentoo.org> files/tmpwatch.cron:
modifiy the cronjob to provide hints about cleaning up portage log files,
diff --git a/app-admin/tmpwatch/files/tmpwatch.cron b/app-admin/tmpwatch/files/tmpwatch.cron
index 54f9e13e1afc..dae37babd5a1 100644
--- a/app-admin/tmpwatch/files/tmpwatch.cron
+++ b/app-admin/tmpwatch/files/tmpwatch.cron
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/files/tmpwatch.cron,v 1.3 2007/01/17 21:24:23 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/files/tmpwatch.cron,v 1.4 2007/01/27 16:51:37 masterdriverz Exp $
# vim: ft=sh
# This cron script contains several (commented out) examples. You may use
@@ -30,7 +30,7 @@ TMPWATCH="/usr/sbin/tmpwatch"
# Delete everything in PORTAGE_TMPDIR that hasn't been modified in 2 weeks.
#
-# if [[ -d ${PORTAGE_TMPDIR:-/var/tmp/portage} ]]; then
+# if [[ -d ${PORTAGE_TMPDIR:-/var/tmp/portage} && -z $(/usr/bin/pgrep emerge) ]]; then
# ${TMPWATCH} --mtime --all 336 ${PORTAGE_TMPDIR:-/var/tmp/portage}
# fi
diff --git a/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild b/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild
index 92cd04554754..5fea2f2460fb 100644
--- a/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild,v 1.10 2005/12/17 02:23:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild,v 1.11 2007/01/27 16:51:37 masterdriverz Exp $
inherit rpm versionator
@@ -35,5 +35,5 @@ src_install() {
doman tmpwatch.8 || die "doman failed"
exeinto /etc/cron.daily
- newexe "${FILESDIR}/${PN}.cron" "${PN}" || die
+ newexe "${FILESDIR}/${PN}.cron" "${PN}" || die 'failed to install cron'
}