[26133] in Source-Commits
/svn/athena r25413 - trunk/debathena/scripts/installer
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Sep 26 16:57:04 2011
Date: Mon, 26 Sep 2011 16:56:57 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201109262056.p8QKuvGF026016@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-09-26 16:56:57 -0400 (Mon, 26 Sep 2011)
New Revision: 25413
Modified:
trunk/debathena/scripts/installer/install-debathena.beta.sh
Log:
DTRT if a user has a debathena.list file, but every line is commented out because do-release-upgrade sucks
Modified: trunk/debathena/scripts/installer/install-debathena.beta.sh
===================================================================
--- trunk/debathena/scripts/installer/install-debathena.beta.sh 2011-09-25 23:46:34 UTC (rev 25412)
+++ trunk/debathena/scripts/installer/install-debathena.beta.sh 2011-09-26 20:56:57 UTC (rev 25413)
@@ -301,7 +301,7 @@
clustersourceslist=/etc/apt/sources.list.d/debathena.clusterinfo.list
if [ -z "$hostname" ] ; then hostname=`hostname` ; fi
-if [ ! -e "$sourceslist" ] || ! grep -q debathena "$sourceslist"; then
+if [ ! -e "$sourceslist" ] || ! grep -v ^# "$sourceslist" | grep -q debathena; then
if [ -e "$sourceslist" ]; then
echo "" >> $sourceslist
fi
