[24119] in Source-Commits
/svn/athena r23721 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Wed Apr 8 17:24:05 2009
Date: Wed, 8 Apr 2009 17:23:53 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <200904082123.n38LNriD029438@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2009-04-08 17:23:53 -0400 (Wed, 08 Apr 2009)
New Revision: 23721
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
Log:
Revert "Use the apt_release key instead of the apt key in clusterinfo".
This reverts r23718. This code could cause unbounded
intrepid-proposed-proposed distributions to end up in sources.list.
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2009-04-08 04:25:18 UTC (rev 23720)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2009-04-08 21:23:53 UTC (rev 23721)
@@ -66,32 +66,14 @@
}
-# Allow hesiod cluster info to specify the debathena apt release.
+# Allow hesiod cluster info to specify the debathena apt repository.
# (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.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"
+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)
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-08 04:25:18 UTC (rev 23720)
+++ trunk/debathena/config/auto-update/debian/changelog 2009-04-08 21:23:53 UTC (rev 23721)
@@ -1,3 +1,10 @@
+debathena-auto-update (1.11.1) unstable; urgency=low
+
+ * Revert "Use the apt_release key instead of the apt key in clusterinfo"
+ because it's buggy.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Wed, 08 Apr 2009 17:20:01 -0400
+
debathena-auto-update (1.11) unstable; urgency=low
* Don't avoid logging the output of `aptitude update` (Closes: Trac #178).
