[26434] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r25570 - trunk/athena/lib/firefox-extension/debian

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jun 5 16:01:01 2012

Date: Tue, 5 Jun 2012 16:00:59 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206052000.q55K0xkp001996@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jdreed
Date: 2012-06-05 16:00:59 -0400 (Tue, 05 Jun 2012)
New Revision: 25570

Modified:
   trunk/athena/lib/firefox-extension/debian/changelog
   trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.postinst
Log:
In firefox-extension:
  * Don't symlink onto something that exists


Modified: trunk/athena/lib/firefox-extension/debian/changelog
===================================================================
--- trunk/athena/lib/firefox-extension/debian/changelog	2012-06-05 18:22:00 UTC (rev 25569)
+++ trunk/athena/lib/firefox-extension/debian/changelog	2012-06-05 20:00:59 UTC (rev 25570)
@@ -1,3 +1,9 @@
+debathena-firefox-extension (10.1-0debathena3) unstable; urgency=low
+
+  * Don't symlink onto something that exists
+
+ -- Jonathan Reed <jdreed@mit.edu>  Tue, 05 Jun 2012 16:00:54 -0400
+
 debathena-firefox-extension (10.1-0debathena2) unstable; urgency=low
 
   * Don't release packages with an distribution of "UNRELEASED"

Modified: trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.postinst
===================================================================
--- trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.postinst	2012-06-05 18:22:00 UTC (rev 25569)
+++ trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.postinst	2012-06-05 20:00:59 UTC (rev 25570)
@@ -50,7 +50,7 @@
 		fi
 	    fi
 	fi
-	if [ -d /usr/lib/firefox/extensions ] && ! [ -h /usr/lib/firefox/extensions ]; then
+	if [ -d /usr/lib/firefox/extensions ] && ! [ -h /usr/lib/firefox/extensions ] && ! [ -e /usr/lib/firefox/extensions/athena@mit.edu ]; then
 	    ln -s /usr/lib/debathena-firefox-extension /usr/lib/firefox/extensions/athena@mit.edu
 	fi
     ;;


home help back first fref pref prev next nref lref last post