2012-08-01 18:20:48 +00:00
|
|
|
Applying this
|
|
|
|
|
|
|
|
|
|
<pre>
|
|
|
|
|
laplace:git-annex jtang$ git diff
|
|
|
|
|
diff --git a/Assistant/WebApp/Configurators.hs b/Assistant/WebApp/Configurators.hs
|
|
|
|
|
index b9630b1..bf36e59 100644
|
|
|
|
|
--- a/Assistant/WebApp/Configurators.hs
|
|
|
|
|
+++ b/Assistant/WebApp/Configurators.hs
|
|
|
|
|
@@ -101,7 +101,7 @@ checkRepositoryPath p = do
|
|
|
|
|
-
|
|
|
|
|
- If run in another directory, the user probably wants to put it there. -}
|
|
|
|
|
defaultRepositoryPath :: Bool -> IO FilePath
|
|
|
|
|
-defaultRepositoryPath firstrun = do
|
|
|
|
|
+defaultRepositoryPath firstRun = do
|
|
|
|
|
cwd <- liftIO $ getCurrentDirectory
|
|
|
|
|
home <- myHomeDir
|
|
|
|
|
if home == cwd && firstRun
|
|
|
|
|
</pre>
|
|
|
|
|
|
|
|
|
|
Causes this to occur,
|
|
|
|
|
|
|
|
|
|
<pre>
|
|
|
|
|
Assistant/WebApp/Configurators.hs:114:17:
|
|
|
|
|
Couldn't match expected type `Control.Monad.Trans.RWS.Lazy.RWST
|
|
|
|
|
(Maybe (Env, FileEnv), WebApp, [Yesod.Form.Types.Lang])
|
|
|
|
|
Enctype
|
|
|
|
|
Ints
|
|
|
|
|
(GHandler WebApp WebApp)
|
|
|
|
|
t0'
|
|
|
|
|
with actual type `Text'
|
|
|
|
|
Expected type: String
|
|
|
|
|
-> Control.Monad.Trans.RWS.Lazy.RWST
|
|
|
|
|
(Maybe (Env, FileEnv), WebApp, [Yesod.Form.Types.Lang])
|
|
|
|
|
Enctype
|
|
|
|
|
Ints
|
|
|
|
|
(GHandler WebApp WebApp)
|
|
|
|
|
t0
|
|
|
|
|
Actual type: String -> Text
|
|
|
|
|
In the first argument of `(.)', namely `T.pack'
|
|
|
|
|
In the first argument of `(<$>)', namely
|
|
|
|
|
`T.pack . addTrailingPathSeparator'
|
|
|
|
|
make: *** [git-annex] Error 1
|
|
|
|
|
</pre>
|
|
|
|
|
|
2012-08-01 21:40:14 +00:00
|
|
|
> [[fixed|done]] --[[Joey]]
|
