diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-02 11:08:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-02 11:10:17 -0400 |
| commit | bdcabb3cfa0a7d14a35a6bcf34f9379e8900f556 (patch) | |
| tree | d1b0c47a1a5ca7c77d671038ea37dadf9238c536 /GitAnnexShell.hs | |
| parent | 8f6c2e6081d8e162f34ff5406e8d564dc1b5f4a5 (diff) | |
fix associatedfile sanity check
It seems best to require that the file just be relative, and not some ../ trick.
git-annex-shell sendkey and recvkey both update transfer information now
Diffstat (limited to 'GitAnnexShell.hs')
| -rw-r--r-- | GitAnnexShell.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/GitAnnexShell.hs b/GitAnnexShell.hs index 497e4cf8f..15be51180 100644 --- a/GitAnnexShell.hs +++ b/GitAnnexShell.hs @@ -85,7 +85,7 @@ builtin :: String -> String -> [String] -> IO () builtin cmd dir params = do checkNotReadOnly cmd let (params', fieldparams) = partitionParams params - fields <- filterM checkField $ parseFields fieldparams + let fields = filter checkField $ parseFields fieldparams dispatch False (cmd : params') cmds options fields header $ Git.Construct.repoAbsPath dir >>= Git.Construct.fromAbsPath @@ -113,11 +113,11 @@ parseFields = map (separate (== '=')) {- Only allow known fields to be set, ignore others. - Make sure that field values make sense. -} -checkField :: (String, String) -> IO Bool +checkField :: (String, String) -> Bool checkField (field, value) | field == fieldName remoteUUID = fieldCheck remoteUUID value | field == fieldName associatedFile = fieldCheck associatedFile value - | otherwise = return False + | otherwise = False failure :: IO () failure = error $ "bad parameters\n\n" ++ usage header cmds options |