[23616] in Source-Commits
/svn/athena r23250 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (andersk@MIT.EDU)
Sat Nov 29 03:45:22 2008
Date: Sat, 29 Nov 2008 03:44:55 -0500 (EST)
From: andersk@MIT.EDU
Message-Id: <200811290844.DAA23059@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2008-11-29 03:44:54 -0500 (Sat, 29 Nov 2008)
New Revision: 23250
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Use aptitude --download-only install to force the aptitude conflict
resolver to make a decision before we decide whether to let it
proceed.
* Abort the upgrade if somehow the scheduled solution still involves
breaking any packages.
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2008-11-25 21:48:54 UTC (rev 23249)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2008-11-29 08:44:54 UTC (rev 23250)
@@ -113,11 +113,17 @@
# metapackage, so be paranoid about that.
v aptitude --quiet --assume-yes keep-all
v aptitude --quiet --assume-yes --schedule-only dist-upgrade
-result=$(aptitude -F "%p" search '~i!~VTARGET(^debathena-cluster$ | ^debathena-workstation$ | ^debathena-login$ | ^debathena-standard$ | ^openafs-modules-~D^linux-image-)')
-if [ -n "$result" ]; then
+v aptitude --quiet --download-only --assume-yes install
+if result=$(aptitude -F "%p" search '~i!~VTARGET(^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
v aptitude --quiet --assume-yes keep-all
complain "metapackages would be removed by update:" $result
+elif result=$(aptitude -F "%p" search '~b')
+ [ -n "$result" ]; then
+ echo "** packages would be broken by the update, aborting:" $result
+ v aptitude --quiet --assume-yes keep-all
+ complain "packages would be broken by update:" $result
else
v aptitude --quiet --assume-yes install
fi
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2008-11-25 21:48:54 UTC (rev 23249)
+++ trunk/debathena/config/auto-update/debian/changelog 2008-11-29 08:44:54 UTC (rev 23250)
@@ -1,3 +1,13 @@
+debathena-auto-update (1.7) unstable; urgency=low
+
+ * Use aptitude --download-only install to force the aptitude conflict
+ resolver to make a decision before we decide whether to let it
+ proceed.
+ * Abort the upgrade if somehow the scheduled solution still involves
+ breaking any packages.
+
+ -- Anders Kaseorg <andersk@mit.edu> Sat, 29 Nov 2008 03:41:31 -0500
+
debathena-auto-update (1.6) unstable; urgency=low
* Protect all installed debathena or openafs metapackages from removal.
