summaryrefslogtreecommitdiff
path: root/src/wrapper.hs
diff options
context:
space:
mode:
authorJoey Hess2015-03-22 10:04:02 -0400
committerJoey Hess2015-03-22 10:04:02 -0400
commitb32d05a661ff2b928bf9472abe8a39743ccea1e7 (patch)
treed16e2df849a7f5591f7f9d00b67f8e3c916227e7 /src/wrapper.hs
parentcec0929a26110ab20bed6d4d59315b3e46775e12 (diff)
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.
Diffstat (limited to 'src/wrapper.hs')
-rw-r--r--src/wrapper.hs2
1 files changed, 1 insertions, 1 deletions
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 $