diff options
| -rw-r--r-- | Assistant/Install.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs index 4d02c0ece..883ca484c 100644 --- a/Assistant/Install.hs +++ b/Assistant/Install.hs @@ -87,8 +87,9 @@ installNautilus :: FilePath -> IO () #ifdef linux_HOST_OS installNautilus program = do scriptdir <- (\d -> d </> "nautilus" </> "scripts") <$> userDataDir - genscript scriptdir "get" - genscript scriptdir "drop" + whenM (doesDirectoryExist scriptdir) $ do + genscript scriptdir "get" + genscript scriptdir "drop" where genscript scriptdir action = installscript (scriptdir </> scriptname action) $ unlines diff --git a/debian/changelog b/debian/changelog index 3d07dbd74..3a94a6094 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ git-annex (5.20140403) UNRELEASED; urgency=medium * git-annex-shell: Added notifychanges command. * Improve display of dbus notifications. Thanks, Johan Kiviniemi. + * Fix nautilus script installation to not crash when the nautilus script dir + does not exist. Instead, only install scripts when the directory already + exists. -- Joey Hess <joeyh@debian.org> Sat, 05 Apr 2014 15:05:44 -0400 |