From 0dbe93477cc66fce787c8d3e251c5737c0a14408 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 3 Nov 2015 11:06:33 -0400 Subject: [PATCH] improve warning --- Setup.hs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Setup.hs b/Setup.hs index 44816774ad..0684674b3f 100644 --- a/Setup.hs +++ b/Setup.hs @@ -65,11 +65,10 @@ installManpages copyDest verbosity pkg lbi = installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO () installDesktopFile copyDest _verbosity pkg lbi | progfile copyDest == progfile NoCopyDest = - let dest = progfile copyDest - in DesktopFile.installUser dest - `catch` installerror dest + DesktopFile.installUser (progfile copyDest) + `catch` installerror | otherwise = return () where progfile cd = bindir (absoluteInstallDirs pkg lbi cd) "git-annex" - installerror :: FilePath -> SomeException -> IO () - installerror dest e = putStrLn ("installation of desktop intrgration files in " ++ dest ++ " did not succeed (" ++ show e ++ "); skipping (set DESTDIR to install these files to a different location)") + installerror :: SomeException -> IO () + installerror e = putStrLn ("Warning: Installation of desktop integration files did not succeed (" ++ show e ++ "); skipping.")