[25885] in Source-Commits
/svn/athena r25278 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Tue Jul 26 19:33:52 2011
Date: Tue, 26 Jul 2011 19:33:45 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201107262333.p6QNXjYs031430@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2011-07-26 19:33:45 -0400 (Tue, 26 Jul 2011)
New Revision: 25278
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Use the aptitude search predicate for removed packages, instead of
writing our own thing based on package versions/states that's
fragile (Trac: #987).
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2011-07-26 20:52:14 UTC (rev 25277)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2011-07-26 23:33:45 UTC (rev 25278)
@@ -325,7 +325,7 @@
# metapackage, so be paranoid about that.
v aptitude --quiet --assume-yes keep-all
v aptitude --quiet --assume-yes --download-only dist-upgrade
-if result=$(aptitude -F "%p" search '~i!~VTARGET(^debathena-cluster$ | ^debathena-workstation$ | ^debathena-login$ | ^debathena-standard$ | ^openafs-modules-~D^linux-image-)')
+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
v aptitude --quiet --assume-yes keep-all
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2011-07-26 20:52:14 UTC (rev 25277)
+++ trunk/debathena/config/auto-update/debian/changelog 2011-07-26 23:33:45 UTC (rev 25278)
@@ -1,3 +1,11 @@
+debathena-auto-update (1.25) unstable; urgency=low
+
+ * Use the aptitude search predicate for removed packages, instead of
+ writing our own thing based on package versions/states that's
+ fragile (Trac: #987).
+
+ -- Geoffrey Thomas <geofft@mit.edu> Tue, 26 Jul 2011 19:30:45 -0400
+
debathena-auto-update (1.24) unstable; urgency=low
* Fix bug which results in update status never recovering from 'warning'
