diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-24 14:48:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-24 15:01:55 -0400 |
| commit | 42e08cd4575d3dc558dfe172c1f28c752d69e8c6 (patch) | |
| tree | 78a8eddc31c390aaf8f66435bb13db9366f9a7c4 /Command/Reinject.hs | |
| parent | 34f375526f44ff255d45bbabcd1425b3d5d0bb4a (diff) | |
| parent | 3b9d9a267b7c9247d36d9b622e1b836724ca5fb0 (diff) | |
Merge branch 'master' into no-xmpp
Diffstat (limited to 'Command/Reinject.hs')
| -rw-r--r-- | Command/Reinject.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Command/Reinject.hs b/Command/Reinject.hs index fa2459e22..7d2da9420 100644 --- a/Command/Reinject.hs +++ b/Command/Reinject.hs @@ -16,8 +16,7 @@ import Types.KeySource cmd :: Command cmd = command "reinject" SectionUtility "inject content of file back into annex" - (paramRepeating (paramPair "SRC" "DEST") - `paramOr` "--known " ++ paramRepeating "SRC") + (paramRepeating (paramPair "SRC" "DEST")) (seek <$$> optParser) data ReinjectOptions = ReinjectOptions @@ -47,7 +46,7 @@ startSrcDest (src:dest:[]) next $ ifAnnexed dest (\key -> perform src key (verifyKeyContent DefaultVerify UnVerified key src)) stop -startSrcDest _ = error "specify a src file and a dest file" +startSrcDest _ = giveup "specify a src file and a dest file" startKnown :: FilePath -> CommandStart startKnown src = notAnnexed src $ do @@ -63,7 +62,8 @@ startKnown src = notAnnexed src $ do ) notAnnexed :: FilePath -> CommandStart -> CommandStart -notAnnexed src = ifAnnexed src (error $ "cannot used annexed file as src: " ++ src) +notAnnexed src = ifAnnexed src $ + giveup $ "cannot used annexed file as src: " ++ src perform :: FilePath -> Key -> Annex Bool -> CommandPerform perform src key verify = ifM move |