From b32d05a661ff2b928bf9472abe8a39743ccea1e7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 22 Mar 2015 10:04:02 -0400 Subject: simplify setup process for minimal config mode Allow cloning a branch. Updated wrapper to check for propellor.cabal and not try to update if it's not present, to handle this case. --- src/wrapper.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/wrapper.hs') diff --git a/src/wrapper.hs b/src/wrapper.hs index 034eb2bf..a73ed969 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -77,7 +77,7 @@ wrapper args propellordir propellorbin = do , void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir] ) - checkRepo = whenM (doesFileExist disthead) $ do + checkRepo = whenM (doesFileExist disthead <&&> doesFileExist (propellordir "propellor.cabal")) $ do headrev <- takeWhile (/= '\n') <$> readFile disthead changeWorkingDirectory propellordir headknown <- catchMaybeIO $ -- cgit v1.2.3