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

When re-execing git-annex, use current program location, rather than ~/.config/git-annex/program, when possible.

Browse source 
Most of the time, there will be no discreprancy between programPath and
readProgramFile.

But, the programFile might have been written by an old version of git-annex
that is still installed, while a newer one is currently running. In this
case, we want to run the same one that's currently running.

This is especially important for things like the GIT_SSH=git-annex used for
ssh connection caching.

The only code that still uses readProgramFile directly is the upgrade code,
which needs to know where the standalone git-annex was installed, in order to
upgrade it.
This commit is contained in:
Joey Hess 2015-02-28 17:23:13 -04:00
parent b9275b65f9
commit 450ee53ab6
14 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Repair.hs
View file

@ -19,7 +19,7 @@ import qualified Types.Remote as Remote
import Logs.FsckResults
import Annex.UUID
import Utility.Batch
import Config.Files
import Annex.Path
import Assistant.Sync
import Assistant.Alert
import Assistant.DaemonStatus
@ -105,7 +105,7 @@ runRepair u mrmt destructiverepair = do
return ok
backgroundfsck params = liftIO $ void $ async $ do
program <- readProgramFile
program <- programPath
batchCommand program (Param "fsck" : params)
{- Detect when a git lock file exists and has no git process currently