Fix behavior of onlyingroup
Sponsored-by: k0ld on Patreon
This commit is contained in:
parent
389b8726fc
commit
6d83bcff0f
3 changed files with 13 additions and 3 deletions
|
@ -1,3 +1,9 @@
|
|||
git-annex (10.20230803) UNRELEASED; urgency=medium
|
||||
|
||||
* Fix behavior of onlyingroup.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Mon, 07 Aug 2023 13:04:13 -0400
|
||||
|
||||
git-annex (10.20230802) upstream; urgency=medium
|
||||
|
||||
* satisfy: New command that gets/sends/drops content to satisfy
|
||||
|
|
8
Limit.hs
8
Limit.hs
|
@ -509,8 +509,9 @@ limitInAllGroup getgroupmap groupname = Right $ MatchFiles
|
|||
present <- S.fromList <$> Remote.keyLocations key
|
||||
return $ S.null $ want `S.difference` present
|
||||
|
||||
{- Skip files that are only present in repositories that are not in the
|
||||
- group. -}
|
||||
{- Skip files unless they are present in at least one repository that is in
|
||||
- the specified group, and are not present in any repositories that are not
|
||||
- in the specified group. -}
|
||||
addOnlyInGroup :: String -> Annex ()
|
||||
addOnlyInGroup groupname = addLimit $ limitOnlyInGroup groupMap groupname
|
||||
|
||||
|
@ -532,7 +533,8 @@ limitOnlyInGroup getgroupmap groupname = Right $ MatchFiles
|
|||
check notpresent want key = do
|
||||
locs <- S.fromList <$> Remote.keyLocations key
|
||||
let present = locs `S.difference` notpresent
|
||||
return $ not $ S.null $ present `S.intersection` want
|
||||
return $ not (S.null $ present `S.intersection` want)
|
||||
&& S.null (S.filter (`S.notMember` want) present)
|
||||
|
||||
{- Adds a limit to skip files not using a specified key-value backend. -}
|
||||
addInBackend :: String -> Annex ()
|
||||
|
|
|
@ -537,3 +537,5 @@ backups, where it gives structure to my image-based backup routines, so you coul
|
|||
say I'm a believer. :)
|
||||
|
||||
[[!meta author=jkniiv]]
|
||||
|
||||
> [[fixed|done]] --[[Joey]]
|
||||
|
|
Loading…
Add table
Reference in a new issue