X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhtsn.git;a=blobdiff_plain;f=src%2FOptionalConfiguration.hs;h=8790ca075943fe94a0f54e9d291a5c5cfc81b8c7;hp=33ca3d9d82e1061c467b3f25eee9e16745c5af4d;hb=a4eb5f096c486cb94b1e8a25de7bc16879cab6e5;hpb=da61a6744550e974688d46b23b11f1a842e4da2e diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs index 33ca3d9..8790ca0 100644 --- a/src/OptionalConfiguration.hs +++ b/src/OptionalConfiguration.hs @@ -35,8 +35,7 @@ import System.IO.Error ( catchIOError ) import System.Log ( Priority(..) ) import FeedHosts ( FeedHosts(..) ) -import Logging ( log_error ) -- Can't import report_error from Main -import Terminal ( display_error ) -- 'cause of circular imports. +import Network.Services.TSN.Report ( report_error ) -- Derive standalone instances of Data and Typeable for Priority. This @@ -145,12 +144,10 @@ instance DCT.Configured Priority where from_rc :: IO OptionalConfiguration from_rc = do etc <- catchIOError getSysconfDir (\e -> do - display_error (show e) - log_error (show e) + report_error (show e) return "/etc") home <- catchIOError getHomeDirectory (\e -> do - display_error (show e) - log_error (show e) + report_error (show e) return "$(HOME)") let global_config_path = etc "htsnrc" let user_config_path = home ".htsnrc"