diff options
| -rw-r--r-- | Build/Configure.hs | 5 | ||||
| -rw-r--r-- | Command/ImportFeed.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | git-annex.cabal | 4 |
4 files changed, 15 insertions, 6 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs index 116a44215..c5e3b9735 100644 --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -7,6 +7,7 @@ import Control.Applicative import System.Environment (getArgs) import Control.Monad.IfElse import Control.Monad +import System.IO import Build.TestConfig import Build.Version @@ -62,7 +63,11 @@ shaTestCases l = map make l key = "sha" ++ show n search [] = return Nothing search (c:cmds) = do + putStr $ "(" ++ c + hFlush stdout sha <- externalSHA c n "/dev/null" + putStr $ ":" ++ show sha ++ ")" + hFlush stdout if sha == Right knowngood then return $ Just c else search cmds diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs index 80e59b739..29f2fb148 100644 --- a/Command/ImportFeed.hs +++ b/Command/ImportFeed.hs @@ -224,11 +224,15 @@ feedFile tmpl i extension = Utility.Format.format tmpl $ M.fromList fieldMaybe k Nothing = (k, "none") fieldMaybe k (Just v) = field k v +#if MIN_VERSION_feed(0,3,9) pubdate itm = case getItemPublishDate itm :: Maybe (Maybe UTCTime) of Just (Just d) -> Just $ formatTime defaultTimeLocale "%F" d -- if date cannot be parsed, use the raw string _ -> replace "/" "-" <$> getItemPublishDateString itm +#else + pubdate _ = Nothing +#endif {- Called when there is a problem with a feed. - Throws an error if the feed is broken, otherwise shows a warning. -} diff --git a/debian/changelog b/debian/changelog index 0d19407ad..8d4816237 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -git-annex (5.20140413) UNRELEASED; urgency=medium +git-annex (5.20140421) unstable; urgency=medium * assistant: Now detects immediately when other repositories push changes to a ssh remote, and pulls. @@ -7,8 +7,8 @@ git-annex (5.20140413) UNRELEASED; urgency=medium notifychanges support (>= 5.20140405) * webapp: Show a network signal icon next to ssh and xmpp remotes that it's currently connected with. - * webapp: Rework xmpp nudge to prompt for either xmpp or a ssh remote be - set up. + * webapp: Rework xmpp nudge to prompt for either xmpp or a ssh remote + to be set up. * sync, assistant, remotedaemon: Use ssh connection caching for git pushes and pulls. * remotedaemon: When network connection is lost, close all cached ssh @@ -38,7 +38,7 @@ git-annex (5.20140413) UNRELEASED; urgency=medium * standalone tarball, OSX app: Install a ~/.ssh/git-annex-wrapper, which can be used to run git-annex, git, rsync, etc. - -- Joey Hess <joeyh@debian.org> Fri, 11 Apr 2014 21:33:35 -0400 + -- Joey Hess <joeyh@debian.org> Sun, 20 Apr 2014 19:43:14 -0400 git-annex (5.20140412) unstable; urgency=high diff --git a/git-annex.cabal b/git-annex.cabal index a2c842287..f7703335f 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20140412 +Version: 5.20140421 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <joey@kitenet.net> @@ -211,7 +211,7 @@ Executable git-annex CPP-Options: -DWITH_DNS if flag(Feed) - Build-Depends: feed (>= 0.3.9.2) + Build-Depends: feed CPP-Options: -DWITH_FEED if flag(Quvi) |