[25417] in Source-Commits
/svn/athena r24966 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Feb 18 22:55:03 2011
Date: Fri, 18 Feb 2011 22:54:57 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201102190354.p1J3svtE028786@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-02-18 22:54:57 -0500 (Fri, 18 Feb 2011)
New Revision: 24966
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Set UCF_FORCE_CONFFfoo variables where appropriate (Trac #552)
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2011-02-19 03:21:49 UTC (rev 24965)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2011-02-19 03:54:57 UTC (rev 24966)
@@ -184,12 +184,19 @@
APTITUDE_OPTS=
UPDATE_FORCE_CONFFILE=old
[ -f /etc/default/debathena-auto-update ] && . /etc/default/debathena-auto-update
+# On cluster machines, force the new conffile if there's a conflict
+# Ignore /etc/default/debathena-auto-update
+if dpkg-query --showformat '${Status}\n' -W "debathena-cluster" 2>/dev/null | grep -q ' installed$'; then
+ UPDATE_FORCE_CONFFILE=new
+fi
case $UPDATE_FORCE_CONFFILE in
old)
APTITUDE_OPTS="-o Dpkg::Options::=--force-confold"
+ export UCF_FORCE_CONFFOLD=1
;;
new)
APTITUDE_OPTS="-o Dpkg::Options::=--force-confnew"
+ export UCF_FORCE_CONFFNEW=1
;;
*)
complain "Invalid value for UPDATE_FORCE_CONFFILE"
@@ -197,11 +204,6 @@
;;
esac
-# On cluster machines, force the new conffile if there's a conflict
-# Ignore /etc/default/debathena-auto-update
-if dpkg-query --showformat '${Status}\n' -W "debathena-cluster" 2>/dev/null | grep -q ' installed$'; then
- APTITUDE_OPTS="-o Dpkg::Options::=--force-confnew"
-fi
# Perform the update. In some corner cases, aptitude might decide
# that the best course of action is to remove the Debathena
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2011-02-19 03:21:49 UTC (rev 24965)
+++ trunk/debathena/config/auto-update/debian/changelog 2011-02-19 03:54:57 UTC (rev 24966)
@@ -5,8 +5,9 @@
* Configurable conffile conflict behavior on workstation (Trac #543)
* Pre-seed /var/lib/athena-update-status (Trac #686)
* Cleanup status file on uninstall
+ * Set UCF_FORCE_CONFFfoo variables where appropriate (Trac #552)
- -- Jonathan Reed <jdreed@mit.edu> Mon, 07 Feb 2011 13:31:32 -0500
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 18 Feb 2011 22:54:38 -0500
debathena-auto-update (1.20) unstable; urgency=low
