summaryrefslogtreecommitdiff
path: root/Setup.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-11-03 11:06:33 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-11-03 11:06:33 -0400
commit4b313bd82d859567548299e56ce45f54fbbd0b67 (patch)
treec37b1b1dee0b2bed8bacd0d00c345c51e96c271c /Setup.hs
parentc95d05b031b5e76a2ca5d4592938485c5bf029db (diff)
improve warning
Diffstat (limited to 'Setup.hs')
-rw-r--r--Setup.hs9
1 files changed, 4 insertions, 5 deletions
diff --git a/Setup.hs b/Setup.hs
index 44816774a..0684674b3 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.")