mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix build without the assistant.

Browse source
This commit is contained in:
Joey Hess 2025-03-26 10:17:03 -04:00
parent fa39406077
commit dbc00906bf
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -3,6 +3,7 @@ git-annex (10.20250321) UNRELEASED; urgency=medium
* updatecluster, updateproxy: When a remote that has no annex-uuid is * updatecluster, updateproxy: When a remote that has no annex-uuid is
configured as annex-cluster-node, warn and avoid writing bad data to configured as annex-cluster-node, warn and avoid writing bad data to
the git-annex branch. the git-annex branch.
* Fix build without the assistant.
-- Joey Hess <id@joeyh.name> Fri, 21 Mar 2025 12:27:11 -0400 -- Joey Hess <id@joeyh.name> Fri, 21 Mar 2025 12:27:11 -0400

2
Utility/DirWatcher.hs
View file

@ -139,7 +139,7 @@ watchDir dir prune scanevents hooks runstartup =
runstartup $ Win32Notify.watchDir dir prune scanevents hooks runstartup $ Win32Notify.watchDir dir prune scanevents hooks
#else #else
type DirWatcherHandle = () type DirWatcherHandle = ()
watchDir :: FilePath -> Pruner -> Bool -> WatchHooks -> (IO () -> IO ()) -> IO DirWatcherHandle watchDir :: OsPath -> Pruner -> Bool -> WatchHooks -> (IO () -> IO ()) -> IO DirWatcherHandle
watchDir = error "watchDir not defined" watchDir = error "watchDir not defined"
#endif #endif
#endif #endif

2
doc/bugs/10.20250320_build_error_when_assistant_is_disabled.mdwn
View file

@ -60,3 +60,5 @@ of the setup in case they turn out to be relevant:
- `--ghc-options="-j$n +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread"` - `--ghc-options="-j$n +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread"`
Full setup is at <https://git.kyleam.com/static-annex/>. Full setup is at <https://git.kyleam.com/static-annex/>.
> [[fixed|done]] --[[Joey]]