[26561] in Source-Commits
/svn/athena r25625 - trunk/athena/lib/firefox-extension/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sun Jul 8 16:43:12 2012
Date: Sun, 8 Jul 2012 16:43:11 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207082043.q68KhBo4018122@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-08 16:43:11 -0400 (Sun, 08 Jul 2012)
New Revision: 25625
Modified:
trunk/athena/lib/firefox-extension/debian/changelog
trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.postinst
Log:
In firefox-extension:
* dpkg-query returns non-zero if a package doesn't exist
Modified: trunk/athena/lib/firefox-extension/debian/changelog
===================================================================
--- trunk/athena/lib/firefox-extension/debian/changelog 2012-07-08 18:02:31 UTC (rev 25624)
+++ trunk/athena/lib/firefox-extension/debian/changelog 2012-07-08 20:43:11 UTC (rev 25625)
@@ -1,3 +1,9 @@
+debathena-firefox-extension (10.1-0debathena4) unstable; urgency=low
+
+ * dpkg-query returns non-zero if a package doesn't exist
+
+ -- Jonathan Reed <jdreed@mit.edu> Sun, 08 Jul 2012 16:44:36 -0400
+
debathena-firefox-extension (10.1-0debathena3) unstable; urgency=low
* Don't symlink onto something that exists
Modified: trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.postinst
===================================================================
--- trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.postinst 2012-07-08 18:02:31 UTC (rev 25624)
+++ trunk/athena/lib/firefox-extension/debian/debathena-firefox-extension.postinst 2012-07-08 20:43:11 UTC (rev 25625)
@@ -26,8 +26,7 @@
configure)
# In 0.9~rc2-0ubuntu2, the conffile moved to /etc/xul-ext
# and we horribly broke things. Let's attempt to unbreak them:
- ubufox_version="$(dpkg-query -W -f '${Version}' ubufox)"
- if dpkg --compare-versions "$ubufox_version" ge "0.9~rc2-0ubuntu2" && [ -d /etc/firefox-3.0/pref ]; then
+ if dpkg-query -W ubufox 2>/dev/null 2>&1 && dpkg --compare-versions "$(dpkg-query -W -f '${Version}' ubufox)" ge "0.9~rc2-0ubuntu2" && [ -d /etc/firefox-3.0/pref ]; then
# The file should have been undiverted at this point
echo "*** The previous OMINOUS WARNING may be safely ignored ***" >&2
# If there are files in the location, move them to
