Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package git-annex for openSUSE:Factory checked in at 2021-04-10 15:27:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-annex (Old) and /work/SRC/openSUSE:Factory/.git-annex.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-annex" Sat Apr 10 15:27:24 2021 rev:17 rq:883529 version:8.20210330 Changes: -------- --- /work/SRC/openSUSE:Factory/git-annex/git-annex.changes 2021-03-28 11:58:08.104318134 +0200 +++ /work/SRC/openSUSE:Factory/.git-annex.new.2401/git-annex.changes 2021-04-10 15:28:28.502455934 +0200 @@ -1,0 +2,52 @@ +Tue Apr 6 08:36:35 UTC 2021 - Ond??ej S??kup <mimi...@gmail.com> + +- add persistent.patch - support new persistent library + +------------------------------------------------------------------- +Wed Mar 31 14:32:42 UTC 2021 - Ond??ej S??kup <mimi...@gmail.com> + +- drop atto.patch + +------------------------------------------------------------------- +Wed Mar 31 14:28:17 UTC 2021 - psim...@suse.com + +- Update git-annex to version 8.20210330. + git-annex (8.20210330) upstream; urgency=medium + + * Behavior change: When autoenabling special remotes of type S3, weddav, + or glacier, do not take login credentials from environment variables, + as the user may not be expecting the autoenable to happen, or may + have those set for other purposes and not intend git-annex to use them. + * New annex.supportunlocked config that can be set to false to avoid + some expensive things needed to support unlocked files, if you do not + use them. + * Fix bug importing from a special remote into a subdirectory more than + one level deep, which generated unusual git trees that could confuse + git merge. + * borg: Fix a bug that prevented importing keys of type URL and WORM. + * borg: Support importing files that are hard linked in the borg backup. + * export: When a submodule is in the tree to be exported, skip it. + * import: When the previously exported tree contained a submodule, + preserve it in the imported tree so it does not get deleted. + * export --json: Fill in the file field. + * rmurl: When youtube-dl was used for an url, it no longer needs to be + prefixed with "yt:" in order to be removed. + * rmurl: If an url is both used by the web and also claimed by another + special remote, fix a bug that caused the url to to not be removed. + * unregisterurl: Fix a bug that caused an url to not be unregistered + when it is claimed by a special remote other than the web. + * whereis: Don't include yt: prefix when showing url to content + retrieved with youtube-dl. + * webdav: Work around some buggy webdav server behavior involving + renaming files. + * Make --debug also enable debugging in child git-annex processes. + * fsck: When --from is used in combination with --all or similar options, + do not verify required content, which can't be checked properly when + operating on keys. + * Sped up git-annex init in a clone of an existing repository. + * Improved display of errors when accessing a git http remote fails. + * Fix build with attoparsec-0.14. + + -- Joey Hess <i...@joeyh.name> Tue, 30 Mar 2021 13:01:17 -0400 + +------------------------------------------------------------------- Old: ---- atto.patch git-annex-8.20210310.tar.gz New: ---- git-annex-8.20210330.tar.gz persistent.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-annex.spec ++++++ --- /var/tmp/diff_new_pack.tWs19v/_old 2021-04-10 15:28:29.094456630 +0200 +++ /var/tmp/diff_new_pack.tWs19v/_new 2021-04-10 15:28:29.094456630 +0200 @@ -17,13 +17,13 @@ Name: git-annex -Version: 8.20210310 +Version: 8.20210330 Release: 0 Summary: Manage files with git, without checking their contents into git License: AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT AND GPL-2.0-only URL: https://hackage.haskell.org/package/%{name} Source0: https://github.com/peti/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: atto.patch +Patch0: persistent.patch BuildRequires: bash-completion BuildRequires: chrpath BuildRequires: curl ++++++ git-annex-8.20210310.tar.gz -> git-annex-8.20210330.tar.gz ++++++ /work/SRC/openSUSE:Factory/git-annex/git-annex-8.20210310.tar.gz /work/SRC/openSUSE:Factory/.git-annex.new.2401/git-annex-8.20210330.tar.gz differ: char 13, line 1 ++++++ persistent.patch ++++++ >From 8868a3a4c7bfaa356d8c0eb7c6abb8b980f63d99 Mon Sep 17 00:00:00 2001 From: Joey Hess <jo...@joeyh.name> Date: Thu, 1 Apr 2021 12:19:47 -0400 Subject: Fix build with persistent-2.12.0.1 persistent stopped using askLogFunc, and the thing to use is askLoggerIO from monad-logger. Bumped the dep to the first version that contained that. Note that the i386ancient build uses a newer monad-logger than 0.3.10, so the new versioned dep should not break it, and presumably nothing else either. This commit was sponsored by Noam Kremen on Patreon. --- CHANGELOG | 6 ++++++ Database/Handle.hs | 6 +++--- doc/bugs/git-annex_8.20210330_fails_to_build_in_brew.mdwn | 2 ++ .../comment_1_ddf94a16e7075c218473b01b15fdca3d._comment | 14 ++++++++++++++ git-annex.cabal | 2 +- 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 doc/bugs/git-annex_8.20210330_fails_to_build_in_brew/comment_1_ddf94a16e7075c218473b01b15fdca3d._comment diff --git a/CHANGELOG b/CHANGELOG index 6f0e0bf35..33c80fa5b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +git-annex (8.20210331) UNRELEASED; urgency=medium + + * Fix build with persistent-2.12.0.1 + + -- Joey Hess <i...@joeyh.name> Thu, 01 Apr 2021 12:17:26 -0400 + git-annex (8.20210330) upstream; urgency=medium * Behavior change: When autoenabling special remotes of type S3, weddav, diff --git a/Database/Handle.hs b/Database/Handle.hs index 2109ad9ac..d7f1822dc 100644 --- a/Database/Handle.hs +++ b/Database/Handle.hs @@ -26,7 +26,7 @@ import qualified Database.Sqlite as Sqlite import Control.Monad import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Unlift (MonadUnliftIO, withRunInIO) -import Control.Monad.Logger (MonadLogger) +import Control.Monad.Logger (MonadLoggerIO, askLoggerIO) import Control.Concurrent import Control.Concurrent.Async import Control.Exception (throwIO, BlockedIndefinitelyOnMVar(..)) @@ -245,7 +245,7 @@ runSqliteRobustly tablename db a = do -- Like withSqlConn, but more robust. withSqlConnRobustly :: (MonadUnliftIO m - , MonadLogger m + , MonadLoggerIO m , IsPersistBackend backend , BaseBackend backend ~ SqlBackend , BackendCompatible SqlBackend backend @@ -254,7 +254,7 @@ withSqlConnRobustly -> (backend -> m a) -> m a withSqlConnRobustly open f = do - logFunc <- askLogFunc + logFunc <- askLoggerIO withRunInIO $ \run -> bracket (open logFunc) closeRobustly
