on master help sign in
add some extra info for better DocsProblem error messages

also add some missing spaces in the output when verifying publication

commit16d322350d388af526ee7f6e89dfbe28bbb2c911 authorEvan Czaplicki <evancz@users.noreply.github.com> dateFri 14 Jun 2019, 11:49 (7 years ago) parentda78d08
2 files changed+4−4
terminal/src/Diff.hs+2−2 terminal/src/Publish.hs+2−2
terminal/src/Diff.hs+2−2
@@ -123,13 +123,13 @@ diff env@(Env _ _ _ registry) args =
123123getDocs :: Env -> Pkg.Name -> Registry.KnownVersions -> V.Version -> Task Docs.Documentation
124124getDocs (Env _ cache manager _) name (Registry.KnownVersions latest previous) version =
125125 if latest == version || elem version previous
126− then Task.eio Exit.DiffDocsProblem $ DD.getDocs cache manager name version
126+ then Task.eio (Exit.DiffDocsProblem version) $ DD.getDocs cache manager name version
127127 else Task.throw $ Exit.DiffUnknownVersion name version (latest:previous)
128128
129129
130130getLatestDocs :: Env -> Pkg.Name -> Registry.KnownVersions -> Task Docs.Documentation
131131getLatestDocs (Env _ cache manager _) name (Registry.KnownVersions latest _) =
132− Task.eio Exit.DiffDocsProblem $ DD.getDocs cache manager name latest
132+ Task.eio (Exit.DiffDocsProblem latest) $ DD.getDocs cache manager name latest
133133
134134
135135
terminal/src/Publish.hs+2−2
@@ -335,7 +335,7 @@ verifyBump (Env _ cache manager _ _) pkg vsn newDocs knownVersions@(Registry.Kno
335335 do result <- Diff.getDocs cache manager pkg old
336336 case result of
337337 Left dp ->
338− return $ Left $ Exit.PublishCannotGetDocs dp
338+ return $ Left $ Exit.PublishCannotGetDocs old new dp
339339
340340 Right oldDocs ->
341341 let
@@ -384,7 +384,7 @@ reportPublishStart pkg vsn maybeKnownVersions =
384384 putStrLn $ Exit.newPackageOverview ++ "\nI will now verify that everything is in order...\n"
385385
386386 Just _ ->
387− putStrLn $ "Verifying" ++ Pkg.toChars pkg ++ V.toChars vsn ++ "...\n"
387+ putStrLn $ "Verifying " ++ Pkg.toChars pkg ++ " " ++ V.toChars vsn ++ " ...\n"
388388
389389
390390