From 1a792c4943618ab681a50ed5523c48aaac8ee154 Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Thu, 7 Mar 2013 20:50:04 +0900 Subject: [PATCH] pkgConf is a directory. --- Cradle.hs | 4 ++-- test/data/cabal-dev/packages-7.6.2.conf | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 test/data/cabal-dev/packages-7.6.2.conf diff --git a/Cradle.hs b/Cradle.hs index 325d245..3cdd7b6 100644 --- a/Cradle.hs +++ b/Cradle.hs @@ -40,7 +40,7 @@ findCradle Nothing strver = do Just (cdir,cfile) -> do let sbox = cdir "cabal-dev/" pkgConf = packageConfName sbox strver - exist <- doesFileExist pkgConf + exist <- doesDirectoryExist pkgConf return Cradle { cradleCurrentDir = wdir , cradleCabalDir = Just cdir @@ -66,7 +66,7 @@ packageConfName path ver = path "packages-" ++ ver ++ ".conf" checkPackageConf :: FilePath -> String -> IO FilePath checkPackageConf path ver = do let conf = packageConfName path ver - exist <- doesFileExist conf + exist <- doesDirectoryExist conf if exist then return conf else diff --git a/test/data/cabal-dev/packages-7.6.2.conf b/test/data/cabal-dev/packages-7.6.2.conf deleted file mode 100644 index 421376d..0000000 --- a/test/data/cabal-dev/packages-7.6.2.conf +++ /dev/null @@ -1 +0,0 @@ -dummy