fix various build warnings, mostly on Windows

And some when S3 is disabled

diff --git a/Assistant/WebApp/Configurators/AWS.hs b/Assistant/WebApp/Configurators/AWS.hs
index 45f9d773ac6a227a32299627956ad6b3cf1b7609..bec3123f89db161dc6a7218ddef056d2db74d18a 100644 (file)
--- a/Assistant/WebApp/Configurators/AWS.hs
+++ b/Assistant/WebApp/Configurators/AWS.hs
@@ -13,12 +13,12 @@ import Assistant.WebApp.Common
 import Assistant.WebApp.MakeRemote
 #ifdef WITH_S3
 import qualified Remote.S3 as S3
-#endif
-import qualified Remote.Glacier as Glacier
-import qualified Remote.Helper.AWS as AWS
 import Logs.Remote
 import qualified Remote
 import qualified Types.Remote as Remote
+#endif
+import qualified Remote.Glacier as Glacier
+import qualified Remote.Helper.AWS as AWS
 import Types.Remote (RemoteConfig)
 import Types.StandardGroups
 import Creds

diff --git a/Assistant/WebApp/Configurators/Edit.hs b/Assistant/WebApp/Configurators/Edit.hs
index 4d4008c327d822fc8c2724636a378a26c517df08..3a9dc78c9f3932317635418fcc598dd6caa6a897 100644 (file)
--- a/Assistant/WebApp/Configurators/Edit.hs
+++ b/Assistant/WebApp/Configurators/Edit.hs
@@ -19,8 +19,8 @@ import Assistant.ScanRemotes
 import Assistant.Sync
 import Assistant.Alert
 import qualified Assistant.WebApp.Configurators.AWS as AWS
-import qualified Assistant.WebApp.Configurators.IA as IA
 #ifdef WITH_S3
+import qualified Assistant.WebApp.Configurators.IA as IA
 import qualified Remote.S3 as S3
 #endif
 import qualified Remote

diff --git a/Assistant/WebApp/Configurators/IA.hs b/Assistant/WebApp/Configurators/IA.hs
index 38bbc2ab3fe608d978c4ecc44b88b240533d8bed..a6816958e750136004ac9abaf37f088af95af714 100644 (file)
--- a/Assistant/WebApp/Configurators/IA.hs
+++ b/Assistant/WebApp/Configurators/IA.hs
@@ -15,15 +15,15 @@ import qualified Assistant.WebApp.Configurators.AWS as AWS
 import qualified Remote.S3 as S3
 import qualified Remote.Helper.AWS as AWS
 import Assistant.WebApp.MakeRemote
-#endif
 import qualified Remote
 import qualified Types.Remote as Remote
 import Types.StandardGroups
-import Types.Remote (RemoteConfig)
 import Logs.Remote
+import Assistant.Gpg
+#endif
+import Types.Remote (RemoteConfig)
 import qualified Annex.Url as Url
 import Creds
-import Assistant.Gpg
 
 import qualified Data.Text as T
 import qualified Data.Map as M

diff --git a/Git/FileMode.hs b/Git/FileMode.hs
index c3dfe570acdc332283f328703234d2a698e79caf..b07fd302c424a170cecc4fe1befec7990473a17c 100644 (file)
--- a/Git/FileMode.hs
+++ b/Git/FileMode.hs
@@ -11,8 +11,6 @@ module Git.FileMode where
 
 import Utility.FileMode
 
-import System.PosixCompat.Types
-
 symLinkMode :: FileMode
 symLinkMode = 40960
 

diff --git a/Remote/Git.hs b/Remote/Git.hs
index c80a0d1c614794c59534f9f5f1c21e345b5f0927..1c2573642d8c0d970802576a5870d56ed7d64388 100644 (file)
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -707,5 +707,5 @@ mkCopier remotewanthardlink rsyncparams = do
                , return copier
                )
 #else
-       return copier
+       return $ if remotewanthardlink then copier else copier
 #endif