mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

improve warning

Browse source
This commit is contained in:
Joey Hess 2015-11-03 11:06:33 -04:00
parent e5323f4414
commit 0dbe93477c
Failed to extract signature
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Setup.hs
View file

@ -65,11 +65,10 @@ installManpages copyDest verbosity pkg lbi =
installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO () installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
installDesktopFile copyDest _verbosity pkg lbi installDesktopFile copyDest _verbosity pkg lbi
| progfile copyDest == progfile NoCopyDest = | progfile copyDest == progfile NoCopyDest =
let dest = progfile copyDest DesktopFile.installUser (progfile copyDest)
in DesktopFile.installUser dest `catch` installerror
`catch` installerror dest
| otherwise = return () | otherwise = return ()
where where
progfile cd = bindir (absoluteInstallDirs pkg lbi cd) </> "git-annex" progfile cd = bindir (absoluteInstallDirs pkg lbi cd) </> "git-annex"
installerror :: FilePath -> SomeException -> IO () installerror :: 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 e = putStrLn ("Warning: Installation of desktop integration files did not succeed (" ++ show e ++ "); skipping.")