[24116] in Source-Commits
/svn/athena r23718 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Tue Apr 7 23:59:43 2009
Date: Tue, 7 Apr 2009 23:59:31 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <200904080359.n383xVZO028477@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2009-04-07 23:59:31 -0400 (Tue, 07 Apr 2009)
New Revision: 23718
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Use the apt_release key instead of the apt key in clusterinfo
(Closes: Trac #163).
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2009-04-06 23:00:58 UTC (rev 23717)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2009-04-08 03:59:31 UTC (rev 23718)
@@ -66,14 +66,32 @@
}
-# Allow hesiod cluster info to specify the debathena apt repository.
+# Allow hesiod cluster info to specify the debathena apt release.
# (Will do nothing if debathena-clusterinfo isn't installed.)
[ -x /usr/sbin/save-cluster-info ] && v /usr/sbin/save-cluster-info
cinfo=/var/run/athena-clusterinfo.sh
-slist=/etc/apt/sources.list.d/debathena.list
-if [ -r $cinfo -a -w $slist ]; then
- (. $cinfo;
- [ -n "$APT" ] && perl -pi.old -e 's|http://\S+|$ENV{"APT"}|e;' $slist)
+slist=/etc/apt/sources.list.d/debathena.clusterinfo.list
+if [ -r "$cinfo" ] && ( [ ! -e "$slist" ] || [ -w "$slist" ] ); then
+ echo "** Updating debathena.clusterinfo.list"
+ dsource="$(egrep -h '^deb(-src)? http://debathena.mit.edu/apt' /etc/apt/sources.list /etc/apt/sources.list.d/*.list 2>/dev/null | sort -u)"
+ if [ -n "$dsource" ]; then
+ (. $cinfo
+ echo "# This file is automatically updated by debathena-auto-update"
+ echo "# based on your Hesiod cluster information. If you want to"
+ echo "# make changes, do so in another file."
+ echo
+ case $APT_RELEASE in
+ production) ;;
+ proposed) echo "$dsource" | awk '{$3 = $3 "-proposed"; print}' ;;
+ development) echo "$dsource" | awk '{$3 = $3 "-proposed"; print}'
+ echo "$dsource" | awk '{$3 = $3 "-development"; print}' ;;
+ esac
+ ) > $slist
+ else
+ echo "Never mind, I can't figure out which sources.list line is Debathena's"
+ fi
+else
+ echo "** Skipping update of debathena.clusterinfo.list"
fi
# Tell apt not to expect user input during package installation.
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2009-04-06 23:00:58 UTC (rev 23717)
+++ trunk/debathena/config/auto-update/debian/changelog 2009-04-08 03:59:31 UTC (rev 23718)
@@ -2,8 +2,10 @@
* Don't avoid logging the output of `aptitude update` (Closes: Trac #178).
* Fix a typo that caused the logger command not to get our hostname.
+ * Use the apt_release key instead of the apt key in clusterinfo
+ (Closes: Trac #163).
- -- Geoffrey Thomas <geofft@mit.edu> Mon, 06 Apr 2009 18:57:32 -0400
+ -- Geoffrey Thomas <geofft@mit.edu> Tue, 07 Apr 2009 23:51:40 -0400
debathena-auto-update (1.10) unstable; urgency=low
