Avoid misbehavior when addurl is used with quvi 0.9.

In 0.9, -v shows version, rather than controlling verbosity.

Still need to port to 0.9, this just avoids massively confusing addurl when
quvi prints its version and exits successfully, on urls that it cannot be
used with.
This commit is contained in:
Joey Hess 2013-11-22 14:12:44 -04:00
parent e2852a62b2
commit 6d23786d96
2 changed files with 3 additions and 2 deletions

View file

@ -68,10 +68,10 @@ check ps url = maybe False (not . null . pageLinks) <$> query ps url
{- Checks if an url is supported by quvi, without hitting it, or outputting
- anything. Also returns False if quvi is not installed. -}
supported :: URLString -> IO Bool
supported url = boolSystem "quvi" [Params "-v mute --support", Param url]
supported url = boolSystem "quvi" [Params "--verbosity mute --support", Param url]
quiet :: CommandParam
quiet = Params "-v quiet"
quiet = Params "--verbosity quiet"
noredir :: CommandParam
noredir = Params "-e -resolve"

1
debian/changelog vendored
View file

@ -1,6 +1,7 @@
git-annex (5.20131121) UNRELEASED; urgency=low
* Futher improvements to git repair.
* Avoid misbehavior when addurl is used with quvi 0.9.
-- Joey Hess <joeyh@debian.org> Wed, 20 Nov 2013 18:30:47 -0400