Don't clean /var/tmp/portage in the example cron if emerge is running; thanks to Ulf Schaper; bug 146973

Package-Manager: portage-2.1.2_rc4-r3

4 files changed, 23 insertions, 18 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/Manifest b/app-admin/tmpwatch/Manifest
index fdac2d879b34..336045ba4966 100644
--- a/app-admin/tmpwatch/Manifest
+++ b/app-admin/tmpwatch/Manifest
@@ -1,21 +1,21 @@
-AUX tmpwatch.cron 1616 RMD160 e97ee234cf2e8fb970f6667fc56d79e80d78793a SHA1 0369447139cb9679b8fb9f7c2f683bbd97701531 SHA256 acc62bfd5d1a22a39dd2f8a9a7f8f601834316f987add26a34d4d859fd85e355
-MD5 2e15d29b182bf0c2d4249ed4ee7dc82e files/tmpwatch.cron 1616
-RMD160 e97ee234cf2e8fb970f6667fc56d79e80d78793a files/tmpwatch.cron 1616
-SHA256 acc62bfd5d1a22a39dd2f8a9a7f8f601834316f987add26a34d4d859fd85e355 files/tmpwatch.cron 1616
+AUX tmpwatch.cron 1653 RMD160 99c68d09c32cb84e46be6573f558a50c24d40160 SHA1 e7a4667ff541e75d9e8a9330440b1dafa8eeaffd SHA256 3f2c29b48d80fb4d46fda05f208d98e2d9ae6089dd2683d4fafd7fbad5cc02fc
+MD5 cc9e7d6336b63f37b42ca55e6878396d files/tmpwatch.cron 1653
+RMD160 99c68d09c32cb84e46be6573f558a50c24d40160 files/tmpwatch.cron 1653
+SHA256 3f2c29b48d80fb4d46fda05f208d98e2d9ae6089dd2683d4fafd7fbad5cc02fc files/tmpwatch.cron 1653
 DIST tmpwatch-2.9.2-2.src.rpm 19298
 DIST tmpwatch-2.9.4-1.src.rpm 19872
 EBUILD tmpwatch-2.9.2.2.ebuild 1417 RMD160 08f0ff2b2a9c42e5c7d281ae2fa8cc733b9993a9 SHA1 f10a40235625dae4be56adfb26b84e5ce7990925 SHA256 c6ea3b05e981a0b893deb27d5f1e43d3ef07addba8d45f92358a31bc81e25052
 MD5 80ecd707bde231d292df4cb5f04d89da tmpwatch-2.9.2.2.ebuild 1417
 RMD160 08f0ff2b2a9c42e5c7d281ae2fa8cc733b9993a9 tmpwatch-2.9.2.2.ebuild 1417
 SHA256 c6ea3b05e981a0b893deb27d5f1e43d3ef07addba8d45f92358a31bc81e25052 tmpwatch-2.9.2.2.ebuild 1417
-EBUILD tmpwatch-2.9.4.1.ebuild 1237 RMD160 4f8a06571fed82fb6f816a111563e268ed839d88 SHA1 032b6e8c504a7b02cc779aa07900453ddba5cd98 SHA256 73db613fad04dd62ea9548c738408d47edc9880149136f2e257cf140a0bfa78e
-MD5 18e87fcb2879f781b4f770d140113430 tmpwatch-2.9.4.1.ebuild 1237
-RMD160 4f8a06571fed82fb6f816a111563e268ed839d88 tmpwatch-2.9.4.1.ebuild 1237
-SHA256 73db613fad04dd62ea9548c738408d47edc9880149136f2e257cf140a0bfa78e tmpwatch-2.9.4.1.ebuild 1237
-MISC ChangeLog 5837 RMD160 61e22f3b19f5782d642cdbec71d2eb19189759b9 SHA1 5b017f485b19b76196615d84abb21ce2e817cf07 SHA256 d1491e17c0c2a058599397c8cf90acc95a809dc85d691b089d9ce5fb0fb10b43
-MD5 e5674609d3b34d29affea8e91b96d469 ChangeLog 5837
-RMD160 61e22f3b19f5782d642cdbec71d2eb19189759b9 ChangeLog 5837
-SHA256 d1491e17c0c2a058599397c8cf90acc95a809dc85d691b089d9ce5fb0fb10b43 ChangeLog 5837
+EBUILD tmpwatch-2.9.4.1.ebuild 1269 RMD160 8fc780f9a899d83d24344ef2eaff8a7a3873233a SHA1 a5601a5066c5e72a01df938f9406bd08aedbb37c SHA256 0afe585312b75ee9fed87c3a1ebdea13cd5a39379727582502ecf26305435474
+MD5 e8fa49b61f6dee91b12ba02448b5aaa1 tmpwatch-2.9.4.1.ebuild 1269
+RMD160 8fc780f9a899d83d24344ef2eaff8a7a3873233a tmpwatch-2.9.4.1.ebuild 1269
+SHA256 0afe585312b75ee9fed87c3a1ebdea13cd5a39379727582502ecf26305435474 tmpwatch-2.9.4.1.ebuild 1269
+MISC ChangeLog 6060 RMD160 66e303da6a167de060edd450cbc758ce54074e30 SHA1 37ec9edafc903a74cf60fe1ce0a4e2384922d25a SHA256 a2c8de7e7d65f63f6b4f9f7236e4061d42610231a37f486544df3799d96a0bca
+MD5 f7538fdfb953f9244c3d824c14f9674e ChangeLog 6060
+RMD160 66e303da6a167de060edd450cbc758ce54074e30 ChangeLog 6060
+SHA256 a2c8de7e7d65f63f6b4f9f7236e4061d42610231a37f486544df3799d96a0bca ChangeLog 6060
 MISC metadata.xml 254 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d SHA1 2d72cad2ed2c3fce67f5ae575a00c3a3ee4e1604 SHA256 ddd8e09da8727f957651a073ae2b61e4a381ee69ab83c93a3077a653743b887f
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d metadata.xml 254
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'
 }