summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-04-23 11:38:52 -0400
committerJoey Hess <joey@kitenet.net>2013-04-23 11:38:52 -0400
commit2c42e70f6c20c533afafea9cab570d1e65ac7c48 (patch)
tree9431ec83107809abfc551d3d99e7fea9452abb03
parent8a2d1988d3b2f1ba3abd0318aa98249d366efa6f (diff)
rename module
-rw-r--r--Assistant/Install.hs2
-rw-r--r--Assistant/Threads/Transferrer.hs2
-rw-r--r--Assistant/WebApp/Configurators/Delete.hs2
-rw-r--r--Assistant/WebApp/Configurators/Local.hs2
-rw-r--r--Assistant/WebApp/Configurators/Preferences.hs2
-rw-r--r--Assistant/WebApp/Control.hs2
-rw-r--r--Assistant/WebApp/OtherRepos.hs2
-rw-r--r--Assistant/WebApp/Utility.hs2
-rw-r--r--Assistant/XMPP/Git.hs2
-rw-r--r--Command/Assistant.hs2
-rw-r--r--Command/WebApp.hs2
-rw-r--r--Config/Files.hs (renamed from Locations/UserConfig.hs)4
12 files changed, 13 insertions, 13 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs
index 3860ed8404..ac1af01356 100644
--- a/Assistant/Install.hs
+++ b/Assistant/Install.hs
@@ -13,7 +13,7 @@ import Assistant.Common
import Assistant.Install.AutoStart
import Assistant.Install.Menu
import Assistant.Ssh
-import Locations.UserConfig
+import Config.Files
import Utility.FileMode
import Utility.Shell
import Utility.TempFile
diff --git a/Assistant/Threads/Transferrer.hs b/Assistant/Threads/Transferrer.hs
index acbac64374..67a8c2a7b5 100644
--- a/Assistant/Threads/Transferrer.hs
+++ b/Assistant/Threads/Transferrer.hs
@@ -22,7 +22,7 @@ import Annex.Content
import qualified Remote
import qualified Types.Remote as Remote
import qualified Git
-import Locations.UserConfig
+import Config.Files
import Assistant.Threads.TransferWatcher
import Annex.Wanted
diff --git a/Assistant/WebApp/Configurators/Delete.hs b/Assistant/WebApp/Configurators/Delete.hs
index 90cbc45408..fffbacfdf2 100644
--- a/Assistant/WebApp/Configurators/Delete.hs
+++ b/Assistant/WebApp/Configurators/Delete.hs
@@ -16,7 +16,7 @@ import Assistant.DaemonStatus
import Assistant.ScanRemotes
import qualified Remote
import qualified Git
-import Locations.UserConfig
+import Config.Files
import Utility.FileMode
import Logs.Trust
import Logs.Remote
diff --git a/Assistant/WebApp/Configurators/Local.hs b/Assistant/WebApp/Configurators/Local.hs
index 89b1f43901..41de69abe8 100644
--- a/Assistant/WebApp/Configurators/Local.hs
+++ b/Assistant/WebApp/Configurators/Local.hs
@@ -19,7 +19,7 @@ import qualified Git.Construct
import qualified Git.Config
import qualified Git.Command
import qualified Annex
-import Locations.UserConfig
+import Config.Files
import Utility.FreeDesktop
#ifdef WITH_CLIBS
import Utility.Mounts
diff --git a/Assistant/WebApp/Configurators/Preferences.hs b/Assistant/WebApp/Configurators/Preferences.hs
index 93e26c0a9d..e14f613fe6 100644
--- a/Assistant/WebApp/Configurators/Preferences.hs
+++ b/Assistant/WebApp/Configurators/Preferences.hs
@@ -16,7 +16,7 @@ import Assistant.WebApp.Common
import qualified Annex
import qualified Git
import Config
-import Locations.UserConfig
+import Config.Files
import Utility.DataUnits
import qualified Data.Text as T
diff --git a/Assistant/WebApp/Control.hs b/Assistant/WebApp/Control.hs
index 946145ce89..53ca0731b1 100644
--- a/Assistant/WebApp/Control.hs
+++ b/Assistant/WebApp/Control.hs
@@ -10,7 +10,7 @@
module Assistant.WebApp.Control where
import Assistant.WebApp.Common
-import Locations.UserConfig
+import Config.Files
import Utility.LogFile
import Assistant.DaemonStatus
import Assistant.WebApp.Utility
diff --git a/Assistant/WebApp/OtherRepos.hs b/Assistant/WebApp/OtherRepos.hs
index b408dd8a5b..1e26376cdc 100644
--- a/Assistant/WebApp/OtherRepos.hs
+++ b/Assistant/WebApp/OtherRepos.hs
@@ -14,7 +14,7 @@ import Assistant.WebApp.Types
import Assistant.WebApp.Page
import qualified Git.Construct
import qualified Git.Config
-import Locations.UserConfig
+import Config.Files
import qualified Utility.Url as Url
import Utility.Yesod
diff --git a/Assistant/WebApp/Utility.hs b/Assistant/WebApp/Utility.hs
index 0dd82a0919..027fc26544 100644
--- a/Assistant/WebApp/Utility.hs
+++ b/Assistant/WebApp/Utility.hs
@@ -19,8 +19,8 @@ import qualified Types.Remote as Remote
import qualified Remote.List as Remote
import qualified Assistant.Threads.Transferrer as Transferrer
import Logs.Transfer
-import Locations.UserConfig
import qualified Config
+import Config.Files
import Git.Config
import Assistant.Threads.Watcher
import Assistant.NamedThread
diff --git a/Assistant/XMPP/Git.hs b/Assistant/XMPP/Git.hs
index 68362c848c..46c8cb1737 100644
--- a/Assistant/XMPP/Git.hs
+++ b/Assistant/XMPP/Git.hs
@@ -25,7 +25,7 @@ import Annex.TaggedPush
import Config
import Git
import qualified Git.Branch
-import Locations.UserConfig
+import Config.Files
import qualified Types.Remote as Remote
import qualified Remote as Remote
import Remote.List
diff --git a/Command/Assistant.hs b/Command/Assistant.hs
index 0997088adf..32c9c7a159 100644
--- a/Command/Assistant.hs
+++ b/Command/Assistant.hs
@@ -12,7 +12,7 @@ import Command
import qualified Option
import qualified Command.Watch
import Init
-import Locations.UserConfig
+import Config.Files
import System.Environment
import System.Posix.Directory
diff --git a/Command/WebApp.hs b/Command/WebApp.hs
index 0e07569015..f85628d28d 100644
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -23,7 +23,7 @@ import qualified Git
import qualified Git.Config
import qualified Git.CurrentRepo
import qualified Annex
-import Locations.UserConfig
+import Config.Files
import qualified Option
import System.Posix.Directory
diff --git a/Locations/UserConfig.hs b/Config/Files.hs
index 429ed8fd55..357481ca67 100644
--- a/Locations/UserConfig.hs
+++ b/Config/Files.hs
@@ -1,11 +1,11 @@
-{- git-annex user config files
+{- git-annex extra config files
-
- Copyright 2012 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.
-}
-module Locations.UserConfig where
+module Config.Files where
import Common
import Utility.TempFile