on master help sign in
Tweak whitespace in some msgs
commit41190784f1e361823ecef936df3a38d6599b7d13 authorLuigy Leon <luichi.19@gmail.com> dateMon 22 Oct 2018, 22:35 (8 years ago) parent4c05172
2 files changed+2−10
lib/command/src/Obelisk/Command.hs+1−9 lib/command/src/Obelisk/Command/Thunk.hs+1−1
lib/command/src/Obelisk/Command.hs+1−9
@@ -238,18 +238,10 @@ mkObeliskConfig = do
238238 -- This function should not use argument parser (full argument parsing happens post handoff)
239239 let logLevel = toLogLevel $ "-v" `elem` cliArgs
240240 notInteractive <- not <$> isInteractiveTerm
241−-- instance MonadIO m => MonadError (Either Text ProcessFailed) (DieT m) where
242−-- throwError = \case
243−-- Left s -> do
244−-- putLog Alert s
245−-- liftIO $ exitWith $ ExitFailure 2
246−-- Right (ProcessFailed p code) -> do
247−-- putLog Alert $ "Process exited with code " <> T.pack (show code) <> "; " <> T.pack (show p)
248−-- liftIO $ exitWith $ ExitFailure 2
249241 cliConf <- newCliConfig logLevel notInteractive notInteractive $ \case
250242 ObeliskError_ProcessError (ProcessFailure p code) ann ->
251243 ( "Process exited with code " <> T.pack (show code) <> "; " <> reconstructCommand p
252− <> maybe "" ("\n\n" <>) ann
244+ <> maybe "" ("\n" <>) ann
253245 , 2
254246 )
255247 ObeliskError_Unstructured msg -> (msg, 2)
lib/command/src/Obelisk/Command/Thunk.hs+1−1
@@ -750,7 +750,7 @@ uriThunkPtr uri mbranch = do
750750 Left e -> do
751751 putLog Warning $ "\
752752\Failed to fetch archive from GitHub. This is probably a private repo. \
753−\Falling back on normal fetchgit. Original failure:\n\n"
753+\Falling back on normal fetchgit. Original failure:"
754754 errorToWarning e
755755 let s' = forgetGithub True s
756756 (,) (ThunkSource_Git s') <$> gitThunkRev s' commit