diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-21 00:37:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-21 00:37:14 -0400 |
| commit | 67ba0c356656b60fab8520866520ee7aefdc94fb (patch) | |
| tree | 1d9d68e5d5d628b5a00ebc27306b1a8fe872b45a | |
| parent | dbc01939f3da3653df51f1fe8b2d5da891ea8828 (diff) | |
allow building with old feed lib, w/o pubdate
| -rw-r--r-- | Command/ImportFeed.hs | 4 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
2 files changed, 5 insertions, 1 deletions
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/git-annex.cabal b/git-annex.cabal index 58bd03fef..f7703335f 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -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) |