diff options
| -rw-r--r-- | Build/DesktopFile.hs | 6 | ||||
| -rw-r--r-- | Setup.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | doc/devblog/day_331__concurrent-output_preparations.mdwn | 11 |
4 files changed, 32 insertions, 1 deletions
diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs index 9d68ff1d9..cb02d749c 100644 --- a/Build/DesktopFile.hs +++ b/Build/DesktopFile.hs @@ -79,3 +79,9 @@ install command = do createDirectoryIfMissing True (parentDir programfile) writeFile programfile command ) + +installUser :: FilePath -> IO () +installUser command = ifM systemwideInstall + ( return () + , install command + ) @@ -14,6 +14,7 @@ import Control.Applicative import Control.Monad import System.Directory import Data.List +import Control.Exception import qualified Build.DesktopFile as DesktopFile import qualified Build.Configure as Configure @@ -64,7 +65,10 @@ installManpages copyDest verbosity pkg lbi = installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO () installDesktopFile copyDest _verbosity pkg lbi | progfile copyDest == progfile NoCopyDest = - DesktopFile.install (progfile copyDest) + DesktopFile.installUser (progfile copyDest) + `catch` installerror | otherwise = return () where progfile cd = bindir (absoluteInstallDirs pkg lbi cd) </> "git-annex" + installerror :: SomeException -> IO () + installerror e = putStrLn ("Warning: Installation of desktop integration files did not succeed (" ++ show e ++ "); skipping.") diff --git a/debian/changelog b/debian/changelog index fed1f76a6..df1fa7436 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +git-annex (5.20151103) UNRELEASED; urgency=medium + + * Avoid installing desktop file and program file if cabal install + git-annex is run as root, since that is not a systemwide install, + but to /root, and so generating a systemwide desktop file is not right. + * When cabal install is run with the desktop file location not writable, + display a warning, but continue successfully. + + -- Joey Hess <id@joeyh.name> Tue, 03 Nov 2015 10:36:43 -0400 + git-annex (5.20151102) unstable; urgency=medium * Use statvfs on OSX. diff --git a/doc/devblog/day_331__concurrent-output_preparations.mdwn b/doc/devblog/day_331__concurrent-output_preparations.mdwn new file mode 100644 index 000000000..028147ad5 --- /dev/null +++ b/doc/devblog/day_331__concurrent-output_preparations.mdwn @@ -0,0 +1,11 @@ +Today started with getting a release of git-annex out, to deal with a new +version of the aws library, which broke the build. That also added support +to the S3 remotes for creating Google Nearline buckets, although only when +git-annex is built with the newest version of the aws library. + +Rest of the day (and most of the past weekend) I've been working on the +concurrent-output library. Today I finished making it support multi-line +regions, and color, and even fully optimised its console updates to use +minimal bandwidth. So, it's got everything git-annex can possibly need +to display those troublesome concurrent actions. Will be starting to make +git-annex use it soon! |