Skip to content

Commit d7f7134

Browse files
committed
Always fatch with the fetch command
1 parent 7ffd20d commit d7f7134

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

src/MicroCabal/Main.hs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ distPkgs =
167167
, StackagePackage "binary" (makeVersion [0,8,9,3]) False []
168168
, StackagePackage "containers" (makeVersion [0,8]) False []
169169
-- , StackagePackage "deepseq" (makeVersion [1,6,0,0]) False [] -- built in
170-
, StackagePackage "exceptions" (makeVersion [0,10,9]) False []
170+
, StackagePackage "exceptions" (makeVersion [0,10,11]) False []
171171
, StackagePackage "filepath" (makeVersion [1,5,4,0]) False []
172172
, StackagePackage "ghc-compat" (makeVersion [0,5,4,0]) False []
173173
, StackagePackage "mtl" (makeVersion [2,3,2]) False []
@@ -215,23 +215,19 @@ cmdFetch env [pkg] = do
215215
pkgz = pkgs ++ ".tar.gz"
216216
pdir = dirForPackage env st
217217
file = pdir ++ ".tar.gz"
218+
rmrf env pdir -- remove existing directory
218219
case gitRepo env of
219220
Nothing -> do
220221
-- Doing a regular hackage fetch.
221-
b <- doesDirectoryExist pdir
222-
if b then
223-
message env 1 $ "No fetch, directory already exists " ++ pdir
224-
else do
225-
message env 1 $ "Fetching from Hackage " ++ pkgz
226-
mkdir env pdir
227-
wget env url file
228-
message env 1 $ "Unpacking " ++ pkgz ++ " in " ++ pdir
229-
tarx env (dirPackage env) file
222+
message env 1 $ "Fetching from Hackage " ++ pkgz
223+
mkdir env pdir
224+
wget env url file
225+
message env 1 $ "Unpacking " ++ pkgz ++ " in " ++ pdir
226+
tarx env (dirPackage env) file
230227
Just repo -> do
231228
-- Doing a git fetch.
232229
-- With --git we will always fetch, blowing away the old repo.
233-
rmrf env pdir
234-
message env 1 $ "Fetching from git repo " ++ pkg
230+
message env 1 $ "Fetching from git repo " ++ repo
235231
gitClone env pdir (URL repo)
236232
cmdFetch _ _ = usage
237233

0 commit comments

Comments
 (0)