[26570] in Source-Commits
Re: /svn/athena r25625 - trunk/athena/lib/firefox-extension/debian
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Tue Jul 10 10:31:10 2012
Date: Tue, 10 Jul 2012 10:31:07 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201207082043.q68KhBo4018122@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1207101029410.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Such fun.
Note that "dpkg-query -W -f '${Version}' ${package}" returns success and
prints the empty string if ${package} is a virtual package; perhaps we
want ge-nl? Otherwise looks good.
-Ben
On Sun, 8 Jul 2012, Jonathan D Reed wrote:
> 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
>
>
