From 402d8ca3b29bfe500ebcbec82bc0d3b2168b6100 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 31 Aug 2017 12:37:25 -0400 Subject: fix error message when content to export is not locally available --- Command/Export.hs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'Command') diff --git a/Command/Export.hs b/Command/Export.hs index 7de143ffb..a2632857a 100644 --- a/Command/Export.hs +++ b/Command/Export.hs @@ -16,6 +16,7 @@ import Types.Key import Types.Remote import Annex.Content import Annex.CatFile +import Logs.Location import Messages.Progress import Utility.Tmp @@ -69,10 +70,15 @@ performExport r diff loc = case storeExport r of Just storer -> next $ do v <- exportKey (Git.DiffTree.dstsha diff) case v of - Right k -> metered Nothing k $ \m -> - sendAnnex k - (void $ performUnexport r k loc) - (\f -> storer f k loc m) + Right k -> ifM (inAnnex k) + ( metered Nothing k $ \m -> + sendAnnex k + (void $ performUnexport r k loc) + (\f -> storer f k loc m) + , do + showNote "not available" + return False + ) -- Sending a non-annexed file. Left sha1k -> metered Nothing sha1k $ \m -> withTmpFile "export" $ \tmp h -> do -- cgit v1.2.3