summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Directory.hs1
-rw-r--r--Remote/External.hs1
-rw-r--r--Remote/External/Types.hs3
-rw-r--r--Remote/Helper/Export.hs5
-rw-r--r--Remote/S3.hs1
-rw-r--r--Remote/WebDAV.hs1
-rw-r--r--Remote/WebDAV/DavLocation.hs2
7 files changed, 10 insertions, 4 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index 24f35868b..2d2daff39 100644
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -19,6 +19,7 @@ import Data.Default
import Annex.Common
import Types.Remote
+import Types.Export
import Types.Creds
import qualified Git
import Config.Cost
diff --git a/Remote/External.hs b/Remote/External.hs
index 2e40ff49a..63f58204a 100644
--- a/Remote/External.hs
+++ b/Remote/External.hs
@@ -11,6 +11,7 @@ import Remote.External.Types
import qualified Annex
import Annex.Common
import Types.Remote
+import Types.Export
import Types.CleanupActions
import Types.UrlContents
import qualified Git
diff --git a/Remote/External/Types.hs b/Remote/External/Types.hs
index 01e44b3a7..0ddbbaf0a 100644
--- a/Remote/External/Types.hs
+++ b/Remote/External/Types.hs
@@ -36,7 +36,8 @@ import Types.StandardGroups (PreferredContentExpression)
import Utility.Metered (BytesProcessed(..))
import Types.Transfer (Direction(..))
import Config.Cost (Cost)
-import Types.Remote (RemoteConfig, ExportLocation(..), ExportDirectory(..))
+import Types.Remote (RemoteConfig)
+import Types.Export
import Types.Availability (Availability(..))
import Types.Key
import Utility.Url (URLString)
diff --git a/Remote/Helper/Export.hs b/Remote/Helper/Export.hs
index 3067ac837..edd0b96df 100644
--- a/Remote/Helper/Export.hs
+++ b/Remote/Helper/Export.hs
@@ -12,6 +12,7 @@ module Remote.Helper.Export where
import Annex.Common
import Types.Remote
import Types.Backend
+import Types.Export
import Types.Key
import Backend
import Remote.Helper.Encryptable (isEncrypted)
@@ -152,12 +153,12 @@ adjustExportable r = case M.lookup "exporttree" (config r) of
-- database.
removeEmptyDirectories :: ExportActions Annex -> ExportHandle -> ExportLocation -> [Key] -> Annex Bool
removeEmptyDirectories ea db loc ks
- | null (exportedDirectories loc) = return True
+ | null (exportDirectories loc) = return True
| otherwise = case removeExportDirectory ea of
Nothing -> return True
Just removeexportdirectory -> do
ok <- allM (go removeexportdirectory)
- (reverse (exportedDirectories loc))
+ (reverse (exportDirectories loc))
unless ok $ liftIO $ do
-- Add back to export database, so this is
-- tried again next time.
diff --git a/Remote/S3.hs b/Remote/S3.hs
index 228a8047e..398ca13b1 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -33,6 +33,7 @@ import System.Log.Logger
import Annex.Common
import Types.Remote
+import Types.Export
import qualified Git
import Config
import Config.Cost
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs
index ce27dd551..921146ebd 100644
--- a/Remote/WebDAV.hs
+++ b/Remote/WebDAV.hs
@@ -22,6 +22,7 @@ import Control.Monad.Catch
import Annex.Common
import Types.Remote
+import Types.Export
import qualified Git
import Config
import Config.Cost
diff --git a/Remote/WebDAV/DavLocation.hs b/Remote/WebDAV/DavLocation.hs
index 74b4831ea..09f2b1b47 100644
--- a/Remote/WebDAV/DavLocation.hs
+++ b/Remote/WebDAV/DavLocation.hs
@@ -11,7 +11,7 @@
module Remote.WebDAV.DavLocation where
import Types
-import Types.Remote (ExportLocation(..))
+import Types.Export
import Annex.Locations
import Utility.Url (URLString)
#ifdef mingw32_HOST_OS