[26619] in Source-Commits
/svn/athena r25658 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 25 13:41:40 2012
Date: Wed, 25 Jul 2012 13:41:38 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207251741.q6PHfcMV024388@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-25 13:41:38 -0400 (Wed, 25 Jul 2012)
New Revision: 25658
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Inhibit all dpkg pre- and post- hooks during the download phase (Trac: #1020)
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2012-07-25 16:56:41 UTC (rev 25657)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2012-07-25 17:41:38 UTC (rev 25658)
@@ -133,18 +133,11 @@
Please log in to a different system.
NOLOGIN
-echo "Inhibiting dpkg-preconfigure to work around aptitude bugs..."
-cat > /etc/apt/apt.conf.d/99debathena-inhibit-preconfigure <<APTCONF
-// This file should only exist while an auto-update is in progress.
-// It will be removed without notice. You have been warned.
-#clear DPkg::Pre-Install-Pkgs;
-APTCONF
-
finish() {
echo "** Ending Athena auto-update at $(date)"
echo "-----"
echo
- rm -f /etc/apt/apt.conf.d/99debathena-inhibit-preconfigure
+ rm -f /etc/apt/apt.conf.d/99zzzzzdebathena-inhibit-pre-and-post-hooks
rm -f $pidfile
rm -f /var/run/athena-nologin
save_state
@@ -308,6 +301,15 @@
exit
fi
+echo "Inhibiting dpkg-preconfigure to work around aptitude bugs..."
+cat > /etc/apt/apt.conf.d/99zzzzzdebathena-inhibit-pre-and-post-hooks <<APTCONF
+// This file should only exist while an auto-update is in progress.
+// It will be removed without notice. You have been warned.
+#clear DPkg::Pre-Install-Pkgs;
+#clear DPkg::Post-Invoke;
+#clear DPkg::Pre-Invoke;
+APTCONF
+
# Download packages first.
if ! v withtimeout aptitude --quiet --assume-yes --download-only full-upgrade; then
complain "download failed"
@@ -343,6 +345,7 @@
# metapackage, so be paranoid about that.
v aptitude --quiet --assume-yes keep-all
v withtimeout aptitude --quiet --assume-yes --download-only dist-upgrade
+rm -f /etc/apt/apt.conf.d/99zzzzzdebathena-inhibit-pre-and-post-hooks
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 2012-07-25 16:56:41 UTC (rev 25657)
+++ trunk/debathena/config/auto-update/debian/changelog 2012-07-25 17:41:38 UTC (rev 25658)
@@ -1,7 +1,7 @@
debathena-auto-update (1.37) UNRELEASED; urgency=low
* Bump debian/compat to 6
- * Inhibit dpkg-preconfigure during auto-updates (Trac: #1020)
+ * Inhibit all dpkg pre- and post- hooks during the download phase (Trac: #1020)
-- Jonathan Reed <jdreed@mit.edu> Fri, 06 Jul 2012 12:55:34 -0400
