[25473] in Source-Commits
/svn/athena r25004 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Mar 7 15:43:35 2011
Date: Mon, 7 Mar 2011 15:43:28 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103072043.p27KhS5K014831@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-07 15:43:28 -0500 (Mon, 07 Mar 2011)
New Revision: 25004
Modified:
trunk/debathena/config/auto-update/debian/changelog
trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst
trunk/debathena/config/auto-update/debian/debathena-auto-update.preinst
Log:
In auto-update:
* Don't blindly copy maintainer script snippets from websites that are
full of lies
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2011-03-07 20:04:54 UTC (rev 25003)
+++ trunk/debathena/config/auto-update/debian/changelog 2011-03-07 20:43:28 UTC (rev 25004)
@@ -1,3 +1,10 @@
+debathena-auto-update (1.22.1) unstable; urgency=low
+
+ * Don't blindly copy maintainer script snippets from websites that are
+ full of lies
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 07 Mar 2011 15:43:03 -0500
+
debathena-auto-update (1.22) unstable; urgency=low
* Install debathena-license-config and reconfigure packages as necessary
Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst
===================================================================
--- trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst 2011-03-07 20:04:54 UTC (rev 25003)
+++ trunk/debathena/config/auto-update/debian/debathena-auto-update.postinst 2011-03-07 20:43:28 UTC (rev 25004)
@@ -40,6 +40,8 @@
/etc/cron.d/debathena-auto-update 1.21~ -- "$@"
else
# From http://wiki.debian.org/DpkgConffileHandling
+ # Which is full of lies, like the fact that postinsts get
+ # called with "install" or "upgrade" when they totally don't
rm_conffile() {
local PKGNAME="$1" # Unused
local CONFFILE="$2"
@@ -48,7 +50,7 @@
fi
}
case "$1" in
- install|upgrade)
+ configure)
if dpkg --compare-versions "$2" le-nl 1.21~; then
rm_conffile debathena-auto-update "/etc/cron.d/debathena-auto-update"
fi
Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.preinst
===================================================================
--- trunk/debathena/config/auto-update/debian/debathena-auto-update.preinst 2011-03-07 20:04:54 UTC (rev 25003)
+++ trunk/debathena/config/auto-update/debian/debathena-auto-update.preinst 2011-03-07 20:43:28 UTC (rev 25004)
@@ -16,7 +16,7 @@
if dpkg-maintscript-helper supports rm_conffile 2> /dev/null; then
dpkg-maintscript-helper rm_conffile \
- /etc/cron.d/debathena-auto-update 1.21~ -- "$@"
+ /etc/cron.d/debathena-auto-update 1.22~ -- "$@"
else
# From http://wiki.debian.org/DpkgConffileHandling
rm_conffile() {
@@ -38,8 +38,8 @@
fi
}
case "$1" in
- abort-install|abort-upgrade)
- if dpkg --compare-versions "$2" le-nl 1.21~; then
+ install|upgrade)
+ if dpkg --compare-versions "$2" le-nl 1.22~; then
rm_conffile debathena-auto-update "/etc/cron.d/debathena-auto-update"
fi
esac
