[26046] in Source-Commits
/svn/athena r25361 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Aug 8 21:47:15 2011
Date: Mon, 8 Aug 2011 21:47:09 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108090147.p791l9TD030225@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-08 21:47:09 -0400 (Mon, 08 Aug 2011)
New Revision: 25361
Removed:
trunk/debathena/config/auto-update/debian/kick-auto-update.sh
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
trunk/debathena/config/auto-update/debian/debathena-auto-update.install
trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst
Log:
In auto-update:
* Revert changes from 1.31 (which didn't actually work) and instead run
all aptitude --download-only invocations inside timeout(1).
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2011-08-08 20:42:20 UTC (rev 25360)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2011-08-09 01:47:09 UTC (rev 25361)
@@ -291,7 +291,7 @@
fi
# Download packages first.
-if ! v aptitude --quiet --assume-yes --download-only full-upgrade; then
+if ! v timeout -k 10s 30m aptitude --quiet --assume-yes --download-only full-upgrade; then
complain "download failed"
exit
fi
@@ -324,7 +324,7 @@
# that the best course of action is to remove the Debathena
# metapackage, so be paranoid about that.
v aptitude --quiet --assume-yes keep-all
-v aptitude --quiet --assume-yes --download-only dist-upgrade
+v timeout -k 10s 30m aptitude --quiet --assume-yes --download-only dist-upgrade
if result=$(aptitude -F "%p" search '?action(remove) (^debathena-cluster$ | ^debathena-workstation$ | ^debathena-login$ | ^debathena-standard$ | ^openafs-modules-~D^linux-image-)')
[ -n "$result" ]; then
echo "** metapackages would be removed by the update, aborting:" $result
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2011-08-08 20:42:20 UTC (rev 25360)
+++ trunk/debathena/config/auto-update/debian/changelog 2011-08-09 01:47:09 UTC (rev 25361)
@@ -1,3 +1,10 @@
+debathena-auto-update (1.32) unstable; urgency=low
+
+ * Revert changes from 1.31 (which didn't actually work) and instead run
+ all aptitude --download-only invocations inside timeout(1).
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 08 Aug 2011 21:46:02 -0400
+
debathena-auto-update (1.31) unstable; urgency=low
* Ship a cron job to prevent auto-update from wedging for more than an
Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.install
===================================================================
--- trunk/debathena/config/auto-update/debian/debathena-auto-update.install 2011-08-08 20:42:20 UTC (rev 25360)
+++ trunk/debathena/config/auto-update/debian/debathena-auto-update.install 2011-08-09 01:47:09 UTC (rev 25361)
@@ -3,4 +3,3 @@
debian/athena-auto-upgrade usr/sbin
debian/athena-auto-upgrade.8 usr/share/man/man8
debian/mitCA.crt usr/share/debathena-auto-update
-debian/kick-auto-update.sh usr/lib/debathena-auto-update
Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst
===================================================================
--- trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst 2011-08-08 20:42:20 UTC (rev 25360)
+++ trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst 2011-08-09 01:47:09 UTC (rev 25361)
@@ -80,11 +80,9 @@
for h in 2 4 6; do
desync2cron $h 120 root /usr/sbin/athena-auto-update cron >> $UPD_CRONFILE
- desync2cron $(expr $h + 1) 120 root /usr/lib/debathena-auto-update/kick-auto-update.sh >> $UPD_CRONFILE
done
for h in 8 14 20; do
desync2cron $h 360 root /usr/sbin/athena-auto-update cron >> $UPD_CRONFILE
- desync2cron $(expr $h + 1) 360 root /usr/lib/debathena-auto-update/kick-auto-update.sh >> $UPD_CRONFILE
done
echo "# Automatically generated by debathena-auto-update postinst" > $UPG_CRONFILE
echo "SHELL=/bin/sh" >> $UPG_CRONFILE
