diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-09-18 18:40:16 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-09-18 19:21:41 -0400 |
| commit | 36533ce176ec653f62fe740f9907f527e4f36361 (patch) | |
| tree | 0c507668c7d19950efa7877ca2155e71ccdb1472 /Annex | |
| parent | 7576fff0131d4f86dc495d58f62490c3264e0e54 (diff) | |
merge changes made on other repos into ExportTree
Now when one repository has exported a tree, another repository can get
files from the export, after syncing.
There's a bug: While the database update works, somehow the database on
disk does not get updated, and so the database update is run the next
time, etc. Wasn't able to figure out why yet.
This commit was sponsored by Ole-Morten Duesund on Patreon.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Locations.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Locations.hs b/Annex/Locations.hs index 947cceef9..f86dfc6f4 100644 --- a/Annex/Locations.hs +++ b/Annex/Locations.hs @@ -303,7 +303,7 @@ gitAnnexExportDbDir u r = gitAnnexExportDir u r </> "db" {- Lock file for export state for a special remote. -} gitAnnexExportLock :: UUID -> Git.Repo -> FilePath -gitAnnexExportLock u r = gitAnnexExportDir u r ++ ".lck" +gitAnnexExportLock u r = gitAnnexExportDbDir u r ++ ".lck" {- .git/annex/schedulestate is used to store information about when - scheduled jobs were last run. -} |