summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-30 14:10:28 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-30 14:10:28 -0400
commitee8845d48d6e70424a7dd65e45d5d2aaba5edab1 (patch)
tree8628387ae12cf3ba9b2e99984277f1118ba76fa6
parente0544f17c1ac482445ff1ae18a413be7cad68f2c (diff)
improve messages
-rw-r--r--Command/Import.hs2
-rw-r--r--Remote.hs4
2 files changed, 4 insertions, 2 deletions
diff --git a/Command/Import.hs b/Command/Import.hs
index 58e4db38a..eb21faea2 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 8a03f757d..90cc6008e 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) ++ ")"