diff options
| -rw-r--r-- | Command/Map.hs | 4 | ||||
| -rw-r--r-- | Command/Trust.hs | 4 | ||||
| -rw-r--r-- | Utility/Yesod.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 7 |
5 files changed, 13 insertions, 8 deletions
diff --git a/Command/Map.hs b/Command/Map.hs index 702cde6e9..e15fd9c33 100644 --- a/Command/Map.hs +++ b/Command/Map.hs @@ -194,11 +194,11 @@ tryScan r | Git.repoIsUrl r = return Nothing | otherwise = liftIO $ safely $ Git.Config.read r where - pipedconfig c params = liftIO $ safely $ + pipedconfig pcmd params = liftIO $ safely $ withHandle StdoutHandle createProcessSuccess p $ Git.Config.hRead r where - p = proc c $ toCommand params + p = proc pcmd $ toCommand params configlist = Ssh.onRemote r (pipedconfig, return Nothing) "configlist" [] [] manualconfiglist = do diff --git a/Command/Trust.hs b/Command/Trust.hs index 5c66c4e98..f02fcf617 100644 --- a/Command/Trust.hs +++ b/Command/Trust.hs @@ -24,11 +24,11 @@ seek :: CommandSeek seek = trustCommand "trust" Trusted trustCommand :: String -> TrustLevel -> CommandSeek -trustCommand cmdname level = withWords start +trustCommand c level = withWords start where start ws = do let name = unwords ws - showStart cmdname name + showStart c name u <- Remote.nameToUUID name next $ perform u perform uuid = do diff --git a/Utility/Yesod.hs b/Utility/Yesod.hs index 6d38ba4ed..afe10a111 100644 --- a/Utility/Yesod.hs +++ b/Utility/Yesod.hs @@ -28,7 +28,11 @@ import Yesod as Y #else import Yesod as Y hiding (Html) #endif +#if MIN_VERSION_yesod_form(1,3,8) +import Yesod.Form.Bootstrap3 as Y hiding (bfs) +#else import Assistant.WebApp.Bootstrap3 as Y hiding (bfs) +#endif #ifndef __NO_TH__ import Yesod.Default.Util import Language.Haskell.TH.Syntax (Q, Exp) diff --git a/debian/changelog b/debian/changelog index 4724b63de..911b97049 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ git-annex (5.20141014) UNRELEASED; urgency=medium * vicfg: Deleting configurations now resets to the default, where before it has no effect. + * Remove hurd stuff from cabal file, since hackage currently rejects + it. -- Joey Hess <joeyh@debian.org> Tue, 14 Oct 2014 14:09:24 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index 18a7150dd..4e13326c2 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -158,7 +158,7 @@ Executable git-annex Build-Depends: DAV (>= 1.0), http-client CPP-Options: -DWITH_WEBDAV - if flag(Assistant) && ! os(solaris) && ! os(gnu) + if flag(Assistant) && ! os(solaris) CPP-Options: -DWITH_ASSISTANT if flag(Assistant) @@ -179,9 +179,8 @@ Executable git-annex Build-Depends: hinotify CPP-Options: -DWITH_INOTIFY else - if ! os(gnu) - CPP-Options: -DWITH_KQUEUE - C-Sources: Utility/libkqueue.c + CPP-Options: -DWITH_KQUEUE + C-Sources: Utility/libkqueue.c if (os(linux)) if flag(Dbus) |