[24185] in Source-Commits
/svn/athena r23786 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Fri May 15 01:40:09 2009
Date: Fri, 15 May 2009 01:39:57 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <200905150539.n4F5dv6v022845@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2009-05-15 01:39:57 -0400 (Fri, 15 May 2009)
New Revision: 23786
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Unrevert "Use the apt_release key", and fix the bugginess.
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2009-05-15 04:55:29 UTC (rev 23785)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2009-05-15 05:39:57 UTC (rev 23786)
@@ -66,14 +66,33 @@
}
-# 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"
+ [ -e "$slist" ] && rm "$slist"
+ 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 '{sub("-.*", "", $3); $3 = $3 "-proposed"; print}' ;;
+ development) echo "$dsource" | awk '{sub("-.*", "", $3); $3 = $3 "-proposed"; print}'
+ echo "$dsource" | awk '{sub("-.*", "", $3); $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-05-15 04:55:29 UTC (rev 23785)
+++ trunk/debathena/config/auto-update/debian/changelog 2009-05-15 05:39:57 UTC (rev 23786)
@@ -1,3 +1,9 @@
+debathena-auto-update (1.11.2) unstable; urgency=low
+
+ * Unrevert "Use the apt_release key", and fix the bugginess.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Fri, 15 May 2009 01:32:52 -0400
+
debathena-auto-update (1.11.1) unstable; urgency=low
* Revert "Use the apt_release key instead of the apt key in clusterinfo"
