From 6d23786d9679f22ffd0711fb4054a50b90b69605 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 Nov 2013 14:12:44 -0400 Subject: [PATCH] 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. --- Utility/Quvi.hs | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Utility/Quvi.hs b/Utility/Quvi.hs index 5df1a4da72..cce02d646c 100644 --- a/Utility/Quvi.hs +++ b/Utility/Quvi.hs @@ -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" diff --git a/debian/changelog b/debian/changelog index 37eb1dffd1..c858cab8bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 20 Nov 2013 18:30:47 -0400