From 607eed0de285290d4b199ba04947834c7e6ec093 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 30 Apr 2015 14:10:28 -0400 Subject: [PATCH] improve messages --- Command/Import.hs | 2 +- Remote.hs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Command/Import.hs b/Command/Import.hs index 58e4db38ae..eb21faea23 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -84,7 +84,7 @@ start mode (srcfile, destfile) = liftIO $ removeFile srcfile next $ return True , do - warning "could not verify that the content is still present in the annex; not removing from the import location" + warning "Could not verify that the content is still present in the annex; not removing from the import location." stop ) importfile = do diff --git a/Remote.hs b/Remote.hs index 8a03f757dd..90cc6008ef 100644 --- a/Remote.hs +++ b/Remote.hs @@ -282,7 +282,9 @@ showLocations separateuntrusted key exclude nolocmsg = do let uuidsskipped = filteruuids uuids (u:exclude++uuidswanted) ppuuidswanted <- prettyPrintUUIDs "wanted" uuidswanted ppuuidsskipped <- prettyPrintUUIDs "skipped" uuidsskipped - showLongNote $ message ppuuidswanted ppuuidsskipped + let msg = message ppuuidswanted ppuuidsskipped + unless (null msg) $ + showLongNote msg ignored <- filter (remoteAnnexIgnore . gitconfig) <$> remoteList unless (null ignored) $ showLongNote $ "(Note that these git remotes have annex-ignore set: " ++ unwords (map name ignored) ++ ")"